From 5788b9087fc78260315d8abc6e2b4da58c24af81 Mon Sep 17 00:00:00 2001
From: Yair Aichenbaum <39923744+yaichenbaum@users.noreply.github.com>
Date: Thu, 31 Mar 2022 15:16:53 -0400
Subject: [PATCH] Added compact mode support to the sidebar

---
 src/Files.Uwp/App.xaml                                   | 4 ++++
 src/Files.Uwp/UserControls/SidebarControl.xaml           | 9 ++++-----
 .../ViewModels/SettingsViewModels/AppearanceViewModel.cs | 2 ++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Files.Uwp/App.xaml b/src/Files.Uwp/App.xaml
index 15bb1d7d8530..e1db0bc48de9 100644
--- a/src/Files.Uwp/App.xaml
+++ b/src/Files.Uwp/App.xaml
@@ -27,6 +27,10 @@
 
             <!--  Default list view item height  -->
             <x:Double x:Key="ListItemHeight">36</x:Double>
+
+            <!--  Default nav menu item height  -->
+            <x:Double x:Key="NavigationViewItemOnLeftMinHeight">32</x:Double>
+
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" ControlsResourcesVersion="Version2" />
                 <ResourceDictionary>
diff --git a/src/Files.Uwp/UserControls/SidebarControl.xaml b/src/Files.Uwp/UserControls/SidebarControl.xaml
index 78805c6ad091..0df92075b2ed 100644
--- a/src/Files.Uwp/UserControls/SidebarControl.xaml
+++ b/src/Files.Uwp/UserControls/SidebarControl.xaml
@@ -1,15 +1,15 @@
 <muxc:NavigationView
     x:Class="Files.UserControls.SidebarControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:navigationcontrolitems="using:Files.DataModels.NavigationControlItems"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:helpers="using:Files.Helpers"
     xmlns:local="using:Files.UserControls"
-    xmlns:vc="using:Files.Uwp.ValueConverters"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mconv="using:Microsoft.Toolkit.Uwp.UI.Converters"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    xmlns:navigationcontrolitems="using:Files.DataModels.NavigationControlItems"
+    xmlns:vc="using:Files.Uwp.ValueConverters"
     HorizontalAlignment="Stretch"
     d:DesignHeight="768"
     d:DesignWidth="200"
@@ -40,7 +40,6 @@
         <ResourceDictionary>
             <mconv:BoolNegationConverter x:Key="BoolNegationConverter" />
             <vc:ColorModelToColorConverter x:Key="ColorModelToColorConverter" />
-            <x:Double  x:Key="NavigationViewItemOnLeftMinHeight">32</x:Double>
 
             <DataTemplate x:Key="LocationNavItem" x:DataType="navigationcontrolitems:LocationItem">
                 <muxc:NavigationViewItem
diff --git a/src/Files.Uwp/ViewModels/SettingsViewModels/AppearanceViewModel.cs b/src/Files.Uwp/ViewModels/SettingsViewModels/AppearanceViewModel.cs
index 9ef9adb34033..3ad97296e203 100644
--- a/src/Files.Uwp/ViewModels/SettingsViewModels/AppearanceViewModel.cs
+++ b/src/Files.Uwp/ViewModels/SettingsViewModels/AppearanceViewModel.cs
@@ -38,10 +38,12 @@ private void SetCompactStyles()
             if (UseCompactStyles)
             {
                 Application.Current.Resources["ListItemHeight"] = 28;
+                Application.Current.Resources["NavigationViewItemOnLeftMinHeight"] = 24;
             }
             else
             {
                 Application.Current.Resources["ListItemHeight"] = 36;
+                Application.Current.Resources["NavigationViewItemOnLeftMinHeight"] = 32;
             }
 
             UpdateTheme();