Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-09 04:37:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Settings] Adding collapse button to settings navview (#5237)

Browse Source 
* Adding collapse button to settings navview

* Custom panewidth
This commit is contained in:
Niels Laute
2020-07-27 18:57:28 +02:00
committed by GitHub
parent d15b0a0285
commit ba7302a197
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml
View File

@@ -7,7 +7,7 @@
xmlns:Controls="clr-namespace:Microsoft.Toolkit.Wpf.UI.Controls;assembly=Microsoft.Toolkit.Wpf.UI.Controls" xmlns:Controls="clr-namespace:Microsoft.Toolkit.Wpf.UI.Controls;assembly=Microsoft.Toolkit.Wpf.UI.Controls"
xmlns:xaml="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost" xmlns:xaml="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost"
mc:Ignorable="d" mc:Ignorable="d"
Title="PowerToys Settings" Height="800" Width="1000" Closing="MainWindow_Closing"> Title="PowerToys Settings" Height="800" Width="1100" Closing="MainWindow_Closing">
<Grid> <Grid>
<xaml:WindowsXamlHost InitialTypeName="Microsoft.PowerToys.Settings.UI.Views.ShellPage" ChildChanged="WindowsXamlHost_ChildChanged" /> <xaml:WindowsXamlHost InitialTypeName="Microsoft.PowerToys.Settings.UI.Views.ShellPage" ChildChanged="WindowsXamlHost_ChildChanged" />
</Grid> </Grid>

2
src/core/Microsoft.PowerToys.Settings.UI/Styles/_Sizes.xaml
View File

@@ -6,7 +6,7 @@
<x:Double x:Key="SidePanelWidth">240</x:Double> <x:Double x:Key="SidePanelWidth">240</x:Double>
<!-- Breakpoint for wide layout (side panel next to content) --> <!-- Breakpoint for wide layout (side panel next to content) -->
<x:Double x:Key="WideLayoutMinWidth">1100</x:Double> <x:Double x:Key="WideLayoutMinWidth">1008</x:Double>
<!-- Breakpoint for small layout (side panel under content) --> <!-- Breakpoint for small layout (side panel under content) -->
<x:Double x:Key="SmallLayoutMinWidth">480</x:Double> <x:Double x:Key="SmallLayoutMinWidth">480</x:Double>

9
src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
View File

@@ -25,10 +25,9 @@
IsBackEnabled="{x:Bind ViewModel.IsBackEnabled, Mode=OneWay}" IsBackEnabled="{x:Bind ViewModel.IsBackEnabled, Mode=OneWay}"
SelectedItem="{x:Bind ViewModel.Selected, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.Selected, Mode=OneWay}"
IsSettingsVisible="False" IsSettingsVisible="False"
IsPaneToggleButtonVisible="False" OpenPaneLength="296"
PaneDisplayMode="Left" CompactModeThresholdWidth="0"
Background="{ThemeResource SystemControlBackgroundAltHighBrush}" Background="{ThemeResource SystemControlBackgroundAltHighBrush}">
>
<winui:NavigationView.MenuItems> <winui:NavigationView.MenuItems>
<winui:NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage"> <winui:NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage">
<winui:NavigationViewItem.Icon> <winui:NavigationViewItem.Icon>
@@ -96,7 +95,7 @@
<behaviors:NavigationViewHeaderBehavior.DefaultHeaderTemplate> <behaviors:NavigationViewHeaderBehavior.DefaultHeaderTemplate>
<DataTemplate> <DataTemplate>
<!-- TODO: Style clean up--> <!-- TODO: Style clean up-->
<Grid Margin="0, 12, 0, 6"> <Grid Margin="0, -2, 0, 6">
<TextBlock <TextBlock
Text="{Binding}" Text="{Binding}"
FontWeight="Bold" FontWeight="Bold"