Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow keyboard access to entire NavigationView by moving it down #1804

Merged
merged 1 commit into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Styles/Thickness.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<Thickness x:Key="NavigationViewContentGridBorderThickness">1,1,0,0</Thickness>
<CornerRadius x:Key="NavigationViewContentGridCornerRadius">8,0,0,0</CornerRadius>
<Thickness x:Key="NavigationViewContentMargin">0,48,0,0</Thickness>
<Thickness x:Key="NavigationViewContentMargin">0,8,0,0</Thickness>
<Thickness x:Key="NavigationViewHeaderMargin">40,0,0,0</Thickness>

<Thickness x:Key="ContentPageMargin">40,0,40,0</Thickness>
Expand Down
7 changes: 7 additions & 0 deletions src/Views/ShellPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,22 @@
Loaded="OnLoaded">

<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<windows:WindowTitleBar
Grid.Row="0"
x:Name="AppTitleBar"
Title="{x:Bind ViewModel.Title}"
Height="{x:Bind NavigationViewControl.CompactPaneLength}" />

<NavigationView
Grid.Row="1"
x:Name="NavigationViewControl"
Canvas.ZIndex="0"
IsBackButtonVisible="Collapsed"
IsTitleBarAutoPaddingEnabled="True"
SelectedItem="{x:Bind ViewModel.Selected, Mode=OneWay}"
IsSettingsVisible="True"
ExpandedModeThresholdWidth="1280"
Expand Down
8 changes: 0 additions & 8 deletions src/Views/ShellPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,6 @@ private void MainWindow_Activated(object sender, WindowActivatedEventArgs args)

private void NavigationViewControl_DisplayModeChanged(NavigationView sender, NavigationViewDisplayModeChangedEventArgs args)
{
AppTitleBar.Margin = new Thickness()
{
Left = sender.CompactPaneLength,
Top = AppTitleBar.Margin.Top,
Right = AppTitleBar.Margin.Right,
Bottom = AppTitleBar.Margin.Bottom,
};

ShellInfoBar.Margin = new Thickness()
{
Left = ShellInfoBar.Margin.Left,
Expand Down