From ba7302a197247b7d091efbd1b95002a924f39591 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Mon, 27 Jul 2020 18:57:28 +0200
Subject: [PATCH] [Settings] Adding collapse button to settings navview (#5237)

* Adding collapse button to settings navview

* Custom panewidth
---
 .../MainWindow.xaml                                      | 2 +-
 .../Microsoft.PowerToys.Settings.UI/Styles/_Sizes.xaml   | 2 +-
 .../Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml b/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml
index 9ab956a269..65774e4cc2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml
@@ -7,7 +7,7 @@
         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"
         mc:Ignorable="d"
-        Title="PowerToys Settings" Height="800" Width="1000" Closing="MainWindow_Closing">
+        Title="PowerToys Settings" Height="800" Width="1100" Closing="MainWindow_Closing">
     <Grid>
         <xaml:WindowsXamlHost InitialTypeName="Microsoft.PowerToys.Settings.UI.Views.ShellPage" ChildChanged="WindowsXamlHost_ChildChanged" />
     </Grid>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Styles/_Sizes.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Styles/_Sizes.xaml
index b1962a77aa..587b10f4bf 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Styles/_Sizes.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Styles/_Sizes.xaml
@@ -6,7 +6,7 @@
     <x:Double x:Key="SidePanelWidth">240</x:Double>
 
     <!-- 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) -->
     <x:Double x:Key="SmallLayoutMinWidth">480</x:Double>
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
index a8d338e44b..1e110106de 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml
@@ -25,10 +25,9 @@
         IsBackEnabled="{x:Bind ViewModel.IsBackEnabled, Mode=OneWay}"
         SelectedItem="{x:Bind ViewModel.Selected, Mode=OneWay}"
         IsSettingsVisible="False"
-        IsPaneToggleButtonVisible="False" 
-        PaneDisplayMode="Left"
-        Background="{ThemeResource SystemControlBackgroundAltHighBrush}"
-            >
+        OpenPaneLength="296"
+        CompactModeThresholdWidth="0"
+        Background="{ThemeResource SystemControlBackgroundAltHighBrush}">
             <winui:NavigationView.MenuItems>
                 <winui:NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage">
                     <winui:NavigationViewItem.Icon>
@@ -96,7 +95,7 @@
                     <behaviors:NavigationViewHeaderBehavior.DefaultHeaderTemplate>
                         <DataTemplate>
                             <!-- TODO: Style clean up-->
-                            <Grid Margin="0, 12, 0, 6">
+                            <Grid Margin="0, -2, 0, 6">
                                 <TextBlock
                                 Text="{Binding}"
                                 FontWeight="Bold"