From 4e2990dce77c31f8b7323eacb0574c8155aee5b8 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Wed, 9 Mar 2022 19:27:32 +0100
Subject: [PATCH] Fix issue where setting IsPaneButtonVisible on NavigationView
 could end up in faulty rendering of pane toggle button (#6780)

* Add test ui

* Fix issue with margin not updating correctly
---
 dev/NavigationView/NavigationView.cpp             |  1 +
 .../TestUI/Common/NavigationViewMinimalPage.xaml  |  3 ++-
 .../Common/NavigationViewMinimalPage.xaml.cs      | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
index 3cafecb6b4..58504794c2 100644
--- a/dev/NavigationView/NavigationView.cpp
+++ b/dev/NavigationView/NavigationView.cpp
@@ -4043,6 +4043,7 @@ void NavigationView::OnPropertyChanged(const winrt::DependencyPropertyChangedEve
         UpdatePaneTitleFrameworkElementParents();
         UpdateBackAndCloseButtonsVisibility();
         UpdatePaneToggleButtonVisibility();
+        UpdateTitleBarPadding();
         UpdateVisualState();
     }
     else if (property == s_IsSettingsVisibleProperty)
diff --git a/dev/NavigationView/TestUI/Common/NavigationViewMinimalPage.xaml b/dev/NavigationView/TestUI/Common/NavigationViewMinimalPage.xaml
index 10dc995133..056a5a5197 100644
--- a/dev/NavigationView/TestUI/Common/NavigationViewMinimalPage.xaml
+++ b/dev/NavigationView/TestUI/Common/NavigationViewMinimalPage.xaml
@@ -13,7 +13,7 @@
     <StackPanel>
         <StackPanel Orientation="Horizontal">
             <muxcontrols:NavigationView x:Name="NavView" AutomationProperties.Name="NavView" AutomationProperties.AutomationId="NavView"
-                                            IsBackEnabled="True" Header="LeftMinimal" PaneDisplayMode="LeftMinimal" Margin="10,0">
+                                            IsBackEnabled="True" Header="LeftMinimal" PaneDisplayMode="LeftMinimal" Margin="10,0" IsPaneToggleButtonVisible="False">
                 <StackPanel>
                     <TextBlock x:Name="NavViewActiveVisualStatesResult" AutomationProperties.Name="NavViewActiveVisualStatesResult"/>
                     <Button x:Name="GetNavViewActiveVisualStates" AutomationProperties.Name="GetNavViewActiveVisualStates" Content="GetNavViewActiveVisualStates" Click="GetNavViewActiveVisualStates_Click"/>
@@ -43,6 +43,7 @@
                 IsChecked="{Binding IsPaneOpen, ElementName=NavViewAuto, Mode=TwoWay}"
                 x:Name="IsAutoPaneOpenCheckBox"
                 AutomationProperties.Name="IsPaneOpenCheckBox" >Toggle auto pane open</CheckBox>
+            <Button Content="Toggle pane open and button visible" Click="TogglePaneOpenButton_Click"/>
         </StackPanel>
     </StackPanel>
 </local:TestPage>
diff --git a/dev/NavigationView/TestUI/Common/NavigationViewMinimalPage.xaml.cs b/dev/NavigationView/TestUI/Common/NavigationViewMinimalPage.xaml.cs
index 9b404f462d..cf4d3123b1 100644
--- a/dev/NavigationView/TestUI/Common/NavigationViewMinimalPage.xaml.cs
+++ b/dev/NavigationView/TestUI/Common/NavigationViewMinimalPage.xaml.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
+using Microsoft.UI.Xaml.Controls;
 using Windows.UI.Xaml;
 
 namespace MUXControlsTestApp
@@ -16,5 +17,19 @@ private void GetNavViewActiveVisualStates_Click(object sender, RoutedEventArgs e
             var visualstates = Utilities.VisualStateHelper.GetCurrentVisualStateName(NavView);
             NavViewActiveVisualStatesResult.Text = string.Join(",", visualstates);
         }
+
+        private void TogglePaneOpenButton_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        {
+            if (NavView.IsPaneToggleButtonVisible)
+            {
+                NavView.PaneDisplayMode = NavigationViewPaneDisplayMode.Left;
+                NavView.IsPaneToggleButtonVisible = false;
+            }
+            else
+            {
+                NavView.PaneDisplayMode = NavigationViewPaneDisplayMode.LeftMinimal;
+                NavView.IsPaneToggleButtonVisible = true;
+            }
+        }
     }
 }