From 3c15df48b91d599bd8420a6ee7455abf38994ce3 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Tue, 14 Jul 2020 21:33:36 +0200
Subject: [PATCH 1/4] Add resource for topmode CustomContentPane minimum width

---
 dev/NavigationView/NavigationView.xaml                    | 2 +-
 dev/NavigationView/NavigationView_rs1_themeresources.xaml | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/NavigationView/NavigationView.xaml b/dev/NavigationView/NavigationView.xaml
index efcb4fb941..ec0395609a 100644
--- a/dev/NavigationView/NavigationView.xaml
+++ b/dev/NavigationView/NavigationView.xaml
@@ -233,7 +233,7 @@
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="*" MinWidth="48"/>
+                                        <ColumnDefinition Width="*" MinWidth="{ThemeResource NavigationViewTopModeContentPaneMinWidth}"/>
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="Auto"/>
diff --git a/dev/NavigationView/NavigationView_rs1_themeresources.xaml b/dev/NavigationView/NavigationView_rs1_themeresources.xaml
index 9a960c71a5..f030a85fd4 100644
--- a/dev/NavigationView/NavigationView_rs1_themeresources.xaml
+++ b/dev/NavigationView/NavigationView_rs1_themeresources.xaml
@@ -231,7 +231,8 @@
     <x:Double x:Key="PaneToggleButtonWidth">40</x:Double>
     <x:Double x:Key="NavigationViewCompactPaneLength">40</x:Double>
     <x:Double x:Key="NavigationViewTopPaneHeight">40</x:Double>
-   
+    <x:Double x:Key="NavigationViewTopModeContentPaneMinWidth">48</x:Double>
+    
     <x:Double x:Key="NavigationViewItemOnLeftMinHeight">40</x:Double>
     <x:Double x:Key="NavigationViewPaneHeaderRowMinHeight">4</x:Double>
 

From c41646077bd4d8b3e48096a27c0e80489a1b4d5b Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Tue, 14 Jul 2020 22:36:28 +0200
Subject: [PATCH 2/4] Update name

---
 dev/NavigationView/NavigationView.xaml                    | 2 +-
 dev/NavigationView/NavigationView_rs1_themeresources.xaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/NavigationView/NavigationView.xaml b/dev/NavigationView/NavigationView.xaml
index ec0395609a..d80f785d5d 100644
--- a/dev/NavigationView/NavigationView.xaml
+++ b/dev/NavigationView/NavigationView.xaml
@@ -113,7 +113,7 @@
                                 <VisualState x:Name="OverflowButtonWithLabel" />
                                 <VisualState x:Name="OverflowButtonNoLabel">
                                     <VisualState.Setters>
-                                        <Setter Target="TopNavOverflowButton.Style" Value="{ThemeResource NavigationViewOverflowButtonNoLabelStyleWhenPaneOnTop}" />
+                                        <Setter Target="TopNavOverflowButton.Style" Value="{ThemeResource TopNavigationViewPaneCustomContentMinWidth}" />
                                     </VisualState.Setters>
                                 </VisualState>
                             </VisualStateGroup>
diff --git a/dev/NavigationView/NavigationView_rs1_themeresources.xaml b/dev/NavigationView/NavigationView_rs1_themeresources.xaml
index f030a85fd4..7312697e1e 100644
--- a/dev/NavigationView/NavigationView_rs1_themeresources.xaml
+++ b/dev/NavigationView/NavigationView_rs1_themeresources.xaml
@@ -231,7 +231,7 @@
     <x:Double x:Key="PaneToggleButtonWidth">40</x:Double>
     <x:Double x:Key="NavigationViewCompactPaneLength">40</x:Double>
     <x:Double x:Key="NavigationViewTopPaneHeight">40</x:Double>
-    <x:Double x:Key="NavigationViewTopModeContentPaneMinWidth">48</x:Double>
+    <x:Double x:Key="TopNavigationViewPaneCustomContentMinWidth">48</x:Double>
     
     <x:Double x:Key="NavigationViewItemOnLeftMinHeight">40</x:Double>
     <x:Double x:Key="NavigationViewPaneHeaderRowMinHeight">4</x:Double>

From 1efe5c9b1bb242e6b5dcdc8db5a6b02ed43a0dd1 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Fri, 17 Jul 2020 18:10:22 +0200
Subject: [PATCH 3/4] Fix missed renaming

---
 dev/NavigationView/NavigationView.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/NavigationView/NavigationView.xaml b/dev/NavigationView/NavigationView.xaml
index d80f785d5d..8a1874b27f 100644
--- a/dev/NavigationView/NavigationView.xaml
+++ b/dev/NavigationView/NavigationView.xaml
@@ -233,7 +233,7 @@
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="*" MinWidth="{ThemeResource NavigationViewTopModeContentPaneMinWidth}"/>
+                                        <ColumnDefinition Width="*" MinWidth="{ThemeResource TopNavigationViewPaneCustomContentMinWidth}"/>
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="Auto"/>
                                         <ColumnDefinition Width="Auto"/>

From 5c8c43548fea9e56451a45255c6c94f88c188201 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Wed, 22 Jul 2020 00:20:50 +0200
Subject: [PATCH 4/4] Reverted wrong setter

---
 dev/NavigationView/NavigationView.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/NavigationView/NavigationView.xaml b/dev/NavigationView/NavigationView.xaml
index 8a1874b27f..7fabe27524 100644
--- a/dev/NavigationView/NavigationView.xaml
+++ b/dev/NavigationView/NavigationView.xaml
@@ -113,7 +113,7 @@
                                 <VisualState x:Name="OverflowButtonWithLabel" />
                                 <VisualState x:Name="OverflowButtonNoLabel">
                                     <VisualState.Setters>
-                                        <Setter Target="TopNavOverflowButton.Style" Value="{ThemeResource TopNavigationViewPaneCustomContentMinWidth}" />
+                                        <Setter Target="TopNavOverflowButton.Style" Value="{ThemeResource NavigationViewOverflowButtonNoLabelStyleWhenPaneOnTop}" />
                                     </VisualState.Setters>
                                 </VisualState>
                             </VisualStateGroup>