From 76e6420002aa045940e998977e22ee9029b9a682 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Sun, 1 Mar 2020 18:42:41 +0100
Subject: [PATCH 01/14] Initial commit of compact pane length handling

---
 dev/NavigationView/NavigationView.cpp         | 54 ++++++++++++++++++-
 dev/NavigationView/NavigationView.h           |  1 +
 dev/NavigationView/NavigationView.xaml        | 18 ++++++-
 dev/NavigationView/NavigationViewItem.cpp     |  1 +
 .../NavigationViewItemPresenter.cpp           | 20 ++++++-
 .../NavigationViewItemPresenter.h             |  4 ++
 6 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
index 515b6b9765..b2ad59f01c 100644
--- a/dev/NavigationView/NavigationView.cpp
+++ b/dev/NavigationView/NavigationView.cpp
@@ -24,6 +24,7 @@
 #include "NavigationViewAutomationPeer.h"
 #include "StackLayout.h"
 
+// General items
 static constexpr auto c_togglePaneButtonName = L"TogglePaneButton"sv;
 static constexpr auto c_paneTitleHolderFrameworkElement = L"PaneTitleHolder"sv;
 static constexpr auto c_paneTitleFrameworkElement = L"PaneTitleTextBlock"sv;
@@ -36,6 +37,7 @@ static constexpr auto c_paneContentGridName = L"PaneContentGrid"sv;
 static constexpr auto c_rootGridName = L"RootGrid"sv;
 static constexpr auto c_contentGridName = L"ContentGrid"sv;
 static constexpr auto c_searchButtonName = L"PaneAutoSuggestButton"sv;
+static constexpr auto c_paneToggleButtonGridName = L"PaneToggleButtonGrid"sv;
 static constexpr auto c_togglePaneTopPadding = L"TogglePaneTopPadding"sv;
 static constexpr auto c_contentPaneTopPadding = L"ContentPaneTopPadding"sv;
 static constexpr auto c_contentLeftPadding = L"ContentLeftPadding"sv;
@@ -45,6 +47,7 @@ static constexpr auto c_navViewCloseButton = L"NavigationViewCloseButton"sv;
 static constexpr auto c_navViewCloseButtonToolTip = L"NavigationViewCloseButtonToolTip"sv;
 static constexpr auto c_paneShadowReceiverCanvas = L"PaneShadowReceiver"sv;
 
+// DisplayMode Top specific items
 static constexpr auto c_topNavMenuItemsHost = L"TopNavMenuItemsHost"sv;
 static constexpr auto c_topNavOverflowButton = L"TopNavOverflowButton"sv;
 static constexpr auto c_topNavMenuItemsOverflowHost = L"TopNavMenuItemsOverflowHost"sv;
@@ -54,6 +57,7 @@ static constexpr auto c_leftNavPaneAutoSuggestBoxPresenter = L"PaneAutoSuggestBo
 static constexpr auto c_topNavPaneAutoSuggestBoxPresenter = L"TopPaneAutoSuggestBoxPresenter"sv;
 static constexpr auto c_paneTitlePresenter = L"PaneTitlePresenter"sv;
 
+// DisplayMode Left specific items
 static constexpr auto c_leftNavFooterContentBorder = L"FooterContentBorder"sv;
 static constexpr auto c_leftNavPaneHeaderContentBorder = L"PaneHeaderContentBorder"sv;
 static constexpr auto c_leftNavPaneCustomContentBorder = L"PaneCustomContentBorder"sv;
@@ -256,6 +260,7 @@ void NavigationView::OnApplyTemplate()
     m_paneTitleOnTopPane.set(GetTemplateChildT<winrt::ContentControl>(c_paneTitleOnTopPane, controlProtected));
     m_paneCustomContentOnTopPane.set(GetTemplateChildT<winrt::ContentControl>(c_paneCustomContentOnTopPane, controlProtected));
     m_paneFooterOnTopPane.set(GetTemplateChildT<winrt::ContentControl>(c_paneFooterOnTopPane, controlProtected));
+    m_paneToggleButtonGrid.set(GetTemplateChildT<winrt::Grid>(c_paneToggleButtonGridName, controlProtected));
 
     // Get a pointer to the root SplitView
     if (auto splitView = GetTemplateChildT<winrt::SplitView>(c_rootSplitViewName, controlProtected))
@@ -3026,6 +3031,15 @@ void NavigationView::OnPropertyChanged(const winrt::DependencyPropertyChangedEve
     {
         // Need to update receiver margins when CompactPaneLength changes
         UpdatePaneShadow();
+
+        // Update pane-button-grid width hwne pane is closed and we are not in minimal
+        if (!IsPaneOpen() && DisplayMode() != winrt::NavigationViewDisplayMode::Minimal)
+        {
+            if (auto paneButtonGrid = m_paneToggleButtonGrid.try_as<winrt::FrameworkElement>())
+            {
+                paneButtonGrid.Width(CompactPaneLength());
+            }
+        }
     }
     else if (property == s_IsTitleBarAutoPaddingEnabledProperty)
     {
@@ -3105,6 +3119,36 @@ void NavigationView::OnIsPaneOpenChanged()
             }
         }
     }
+    if (isPaneOpen || DisplayMode() == winrt::NavigationViewDisplayMode::Minimal)
+    {
+        // Opening pane, so we need to clear the button grid width to prevent clipping
+        if (auto paneButtonGrid = m_paneToggleButtonGrid.try_as<winrt::FrameworkElement>())
+        {
+            paneButtonGrid.Width(NAN);
+        }
+    }
+    else
+    {
+        // Closing pane, so we need to set width of button grid so they are centered
+        if (DisplayMode() != winrt::NavigationViewDisplayMode::Minimal)
+        {
+            // Update pane (toggle) button grid's width for button centering
+            if (auto paneButtonGrid = m_paneToggleButtonGrid.try_as<winrt::FrameworkElement>())
+            {
+                paneButtonGrid.Width(CompactPaneLength());
+            }
+        }
+    }
+
+    if (isPaneOpen)
+    {
+        winrt::VisualStateManager::GoToState(*this, L"PaneOpen", false /* usetransition */);
+    }
+    else
+    {
+        winrt::VisualStateManager::GoToState(*this, L"PaneClosed", false /* usetransition */);
+    }
+
     SetPaneToggleButtonAutomationName();
     UpdatePaneTabFocusNavigation();
     UpdateSettingsItemToolTip();
@@ -3155,7 +3199,15 @@ void NavigationView::UpdatePaneDisplayMode()
                 thisAsUIElement8.KeyTipTarget(paneToggleButton);
             }
         }
-        
+
+        //if (DisplayMode() == winrt::NavigationViewDisplayMode::Compact)
+        //{
+        //    // Update pane (toggle) button grid's width for button centering
+        //    if (auto paneButtonGrid = m_paneToggleButtonGrid.try_as<winrt::FrameworkElement>())
+        //    {
+        //        paneButtonGrid.Width(CompactPaneLength());
+        //    }
+        //}
     }
     else
     {
diff --git a/dev/NavigationView/NavigationView.h b/dev/NavigationView/NavigationView.h
index 69ea97ad34..db1fe01374 100644
--- a/dev/NavigationView/NavigationView.h
+++ b/dev/NavigationView/NavigationView.h
@@ -272,6 +272,7 @@ class NavigationView :
     tracker_ref<winrt::SplitView> m_rootSplitView{ this };
     tracker_ref<winrt::NavigationViewItem> m_settingsItem{ this };
     tracker_ref<winrt::UIElement> m_paneContentGrid{ this };
+    tracker_ref<winrt::FrameworkElement> m_paneToggleButtonGrid{ this };
     tracker_ref<winrt::FrameworkElement> m_paneTitleHolderFrameworkElement{ this };
     tracker_ref<winrt::FrameworkElement> m_paneTitleFrameworkElement{ this };
     tracker_ref<winrt::Button> m_paneSearchButton{ this };
diff --git a/dev/NavigationView/NavigationView.xaml b/dev/NavigationView/NavigationView.xaml
index 1659ca3e09..b8ada10b23 100644
--- a/dev/NavigationView/NavigationView.xaml
+++ b/dev/NavigationView/NavigationView.xaml
@@ -1,4 +1,4 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -75,6 +75,16 @@
                                 </VisualState>
                             </VisualStateGroup>
 
+                            <VisualStateGroup x:Name="PaneOpenStateGroup">
+                                <VisualState x:Name="PaneOpen" />
+
+                                <VisualState x:Name="PaneClosed">
+                                    <VisualState.Setters>
+                                        <Setter Target="ButtonHolderGrid.HorizontalAlignment" Value="Center"/>
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                            
                             <VisualStateGroup x:Name="PaneStateGroup">
                                 <VisualState x:Name="NotClosedCompact" />
                                 <VisualState x:Name="ClosedCompact">
@@ -140,6 +150,7 @@
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
 
+                        <!-- Button grid -->
                         <Grid
                             x:Name="PaneToggleButtonGrid"
                             Margin="0,0,0,8"
@@ -200,13 +211,15 @@
                                 </Grid>
                             </Grid>
                         </Grid>
-
+                        
+                        <!-- Content layouts -->
                         <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto"/>
                                 <RowDefinition Height="*"/>
                             </Grid.RowDefinitions>
 
+                            <!-- DisplayMode top -->
                             <StackPanel
                                 x:Name="TopNavArea"
                                 Background="{ThemeResource NavigationViewTopPaneBackground}"
@@ -347,6 +360,7 @@
                                     Child="{TemplateBinding ContentOverlay}" />
                             </StackPanel>
 
+                            <!-- Displaymode (compact/minimal/normal) left -->
                             <SplitView
                                 x:Name="RootSplitView"
                                 Background="{TemplateBinding Background}"
diff --git a/dev/NavigationView/NavigationViewItem.cpp b/dev/NavigationView/NavigationViewItem.cpp
index 7a05763c42..0661ed9649 100644
--- a/dev/NavigationView/NavigationViewItem.cpp
+++ b/dev/NavigationView/NavigationViewItem.cpp
@@ -89,6 +89,7 @@ void NavigationViewItem::UpdateCompactPaneLength()
     if (auto splitView = GetSplitView())
     {
         SetValue(s_CompactPaneLengthProperty, winrt::PropertyValue::CreateDouble(splitView.CompactPaneLength()));
+        GetPresenter()->UpdateCompactPaneLength(splitView.CompactPaneLength());
     }
 }
 
diff --git a/dev/NavigationView/NavigationViewItemPresenter.cpp b/dev/NavigationView/NavigationViewItemPresenter.cpp
index 712d6de01f..1dba95a01e 100644
--- a/dev/NavigationView/NavigationViewItemPresenter.cpp
+++ b/dev/NavigationView/NavigationViewItemPresenter.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 #include "pch.h"
@@ -7,6 +7,8 @@
 #include "NavigationViewItem.h"
 #include "SharedHelpers.h"
 
+static constexpr auto c_iconBoxColumnDefinitionName = L"IconColumn"sv;
+
 NavigationViewItemPresenter::NavigationViewItemPresenter()
 {
     SetDefaultStyleKey(this);
@@ -14,12 +16,16 @@ NavigationViewItemPresenter::NavigationViewItemPresenter()
 
 void NavigationViewItemPresenter::OnApplyTemplate()
 {
+    winrt::IControlProtected controlProtected = *this;
+
     // Retrieve pointers to stable controls 
     m_helper.Init(*this);
     if (auto navigationViewItem = GetNavigationViewItem())
     {
         navigationViewItem->UpdateVisualStateNoTransition();
     }
+
+    m_iconBoxColumnDefinition.set(GetTemplateChildT<winrt::ColumnDefinition>(c_iconBoxColumnDefinitionName, controlProtected));
 }
 
 winrt::UIElement NavigationViewItemPresenter::GetSelectionIndicator()
@@ -54,4 +60,14 @@ NavigationViewItem* NavigationViewItemPresenter::GetNavigationViewItem()
         navigationViewItem = winrt::get_self<NavigationViewItem>(item);
     }
     return navigationViewItem;
-}
\ No newline at end of file
+}
+
+void NavigationViewItemPresenter::UpdateCompactPaneLength(double compactPaneLength)
+{
+    if (auto iconGridColumn = m_iconBoxColumnDefinition.try_as<winrt::ColumnDefinition>())
+    {
+        auto gridLength = iconGridColumn.Width();
+        gridLength.Value = compactPaneLength;
+        iconGridColumn.Width(gridLength);
+    }
+}
diff --git a/dev/NavigationView/NavigationViewItemPresenter.h b/dev/NavigationView/NavigationViewItemPresenter.h
index bfe422fd75..0a5a00ae3b 100644
--- a/dev/NavigationView/NavigationViewItemPresenter.h
+++ b/dev/NavigationView/NavigationViewItemPresenter.h
@@ -23,8 +23,12 @@ class NavigationViewItemPresenter:
 
     winrt::UIElement GetSelectionIndicator();
 
+    void UpdateCompactPaneLength(double compactPaneLength);
+
 private:
     NavigationViewItem * GetNavigationViewItem();
 
+    tracker_ref<winrt::ColumnDefinition> m_iconBoxColumnDefinition{ this };
+
     NavigationViewItemHelper<NavigationViewItemPresenter> m_helper{ this };
 };

From 9498adfa7713c2d14d01063b5a768548e14ca71e Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Sun, 1 Mar 2020 23:35:12 +0100
Subject: [PATCH 02/14] Add interaction test

---
 .../NavigationViewTests.cs                    |  23 ++++
 .../TestUI/NavigationViewCaseBundle.xaml      |   1 +
 .../TestUI/NavigationViewCaseBundle.xaml.cs   |   1 +
 ...vigationViewCompactPaneLengthTestPage.xaml | 113 ++++++++++++++++++
 ...ationViewCompactPaneLengthTestPage.xaml.cs | 109 +++++++++++++++++
 .../TestUI/NavigationView_TestUI.projitems    |   7 ++
 6 files changed, 254 insertions(+)
 create mode 100644 dev/NavigationView/TestUI/NavigationViewCompactPaneLengthTestPage.xaml
 create mode 100644 dev/NavigationView/TestUI/NavigationViewCompactPaneLengthTestPage.xaml.cs

diff --git a/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs b/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs
index 8de0fafd3d..bf2a6ea1d2 100644
--- a/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs
+++ b/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs
@@ -4179,6 +4179,29 @@ public void VerifyEventsReturnExpectedDataTypesMenuItemsSource()
             }
         }
 
+        [TestMethod]
+        [TestProperty("TestSuide","D")]
+        public void VerifyIconsRespectCompactPaneLength()
+        {
+            using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", "NavigationView compact pane length test" }))
+            {
+                var checkMenuItemsButton = FindElement.ByName("CheckMenuItemsOffset");
+                var compactpaneCheckbox = new ComboBox(FindElement.ByName("CompactPaneLenghtComboBox"));
+                var currentStatus = new CheckBox(FindElement.ByName("MenuItemsCorrectOffset"));
+
+                checkMenuItemsButton.Click();
+                Wait.ForIdle();
+                Verify.IsTrue(currentStatus.ToggleState == ToggleState.On);
+
+                compactpaneCheckbox.SelectItemByName("96");
+                Wait.ForIdle();
+
+                checkMenuItemsButton.Click();
+                Wait.ForIdle();
+                Verify.IsTrue(currentStatus.ToggleState == ToggleState.On);
+            }
+        }
+
         private void EnsurePaneHeaderCanBeModifiedHelper(RegressionTestType navviewMode)
         {
             if (!PlatformConfiguration.IsOsVersionGreaterThanOrEqual(OSVersion.Redstone2))
diff --git a/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml b/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml
index fb4a02045d..1a14e2bd52 100644
--- a/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml
+++ b/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml
@@ -23,6 +23,7 @@
         <StackPanel>
             <TextBlock Text="Common tests"/>
             <Button x:Name="NavigationViewPage" AutomationProperties.Name="NavigationView Test" Margin="2" HorizontalAlignment="Stretch">NavigationView Test</Button>
+            <Button x:Name="NavigationViewCompactPaneLengthTestPage" AutomationProperties.Name="NavigationView compact pane length test" Margin="2" HorizontalAlignment="Stretch">NavigationView compact pane length test</Button>
             <Button x:Name="NavigationViewPageDataContext" AutomationProperties.Name="NavigationViewPageDataContext" Margin="2" HorizontalAlignment="Stretch">NavigationView DataContext</Button>
             <Button x:Name="NavigateToSelectedItemEdgeCasePage" AutomationProperties.Name="SelectedItem edge case test" Margin="2" HorizontalAlignment="Stretch">SelectedItem edge Case Test</Button>
             <Button x:Name="NavigateToInitPage" AutomationProperties.Name="NavigationView Init Test" Margin="2" HorizontalAlignment="Stretch">NavigationView Init Test</Button>
diff --git a/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml.cs b/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml.cs
index 1ada28eb11..c5a9010f49 100644
--- a/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml.cs
+++ b/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml.cs
@@ -19,6 +19,7 @@ public NavigationViewCaseBundle()
         {
             this.InitializeComponent();
             NavigationViewPage.Click += delegate { Frame.NavigateWithoutAnimation(typeof(NavigationViewPage), 0); };
+            NavigationViewCompactPaneLengthTestPage.Click += delegate { Frame.NavigateWithoutAnimation(typeof(NavigationViewCompactPaneLengthTestPage), 0); };
             NavigationViewRS4Page.Click += delegate { Frame.NavigateWithoutAnimation(typeof(NavigationViewRS4Page), 0); };
             NavigationViewPageDataContext.Click += delegate { Frame.NavigateWithoutAnimation(typeof(NavigationViewPageDataContext), 0); };
             NavigationViewTopNavPage.Click += delegate { Frame.NavigateWithoutAnimation(typeof(NavigationViewTopNavPage), 0); };
diff --git a/dev/NavigationView/TestUI/NavigationViewCompactPaneLengthTestPage.xaml b/dev/NavigationView/TestUI/NavigationViewCompactPaneLengthTestPage.xaml
new file mode 100644
index 0000000000..bf45f4f355
--- /dev/null
+++ b/dev/NavigationView/TestUI/NavigationViewCompactPaneLengthTestPage.xaml
@@ -0,0 +1,113 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<local:TestPage
+    x:Class="MUXControlsTestApp.NavigationViewCompactPaneLengthTestPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:MUXControlsTestApp"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <Grid>
+        <muxc:NavigationView x:Name="NavView">
+
+            <muxc:NavigationView.MenuItems>
+                <muxc:NavigationViewItem x:Name="HomeItem" Content="Home" Icon="Home"/>
+                <muxc:NavigationViewItem x:Name="AppsItem" Content="Apps" Icon="Shop" />
+                <muxc:NavigationViewItem x:Name="GamesItem" Content="Games" Icon="Emoji"/>
+                <muxc:NavigationViewItemSeparator />
+                <muxc:NavigationViewItemHeader x:Name="HeaderTextItem" Content="Header Text" />
+                <muxc:NavigationViewItem x:Name="MusicItem" Content="Music" Icon="Audio"/>
+                <muxc:NavigationViewItem x:Name="MoviesItem" Content="Movies" Icon="Video"/>
+                <muxc:NavigationViewItemHeader x:Name="HeaderTextItem2" Content="Header Text 2" />
+                <muxc:NavigationViewItem x:Name="TVItem" Content="TV" Icon="Slideshow"/>
+                <muxc:NavigationViewItem x:Name="VolumeItem" AutomationProperties.Name="Volume" Icon="Volume">
+                    <muxc:NavigationViewItem.Content>
+                        <TextBlock Text="Volume (don't click me)" />
+                    </muxc:NavigationViewItem.Content>
+                </muxc:NavigationViewItem>
+                <muxc:NavigationViewItem x:Name="IntegerItem" AutomationProperties.Name="Integer" Icon="Accept"/>
+            </muxc:NavigationView.MenuItems>
+
+            <muxc:NavigationView.AutoSuggestBox>
+                <AutoSuggestBox QueryIcon="Find" AutomationProperties.Name="PaneAutoSuggestBox"/>
+            </muxc:NavigationView.AutoSuggestBox>
+
+            
+            <muxc:NavigationView.Content>
+                <StackPanel Padding="50" Orientation="Horizontal">
+                    <StackPanel Style="{ThemeResource StandardGroupingStackPanel}" Margin="0,0,16,0">
+                        <TextBlock Text="Options" Style="{ThemeResource StandardGroupHeader}"/>
+
+                        <CheckBox
+                            x:Name="IsPaneOpenCheckBox"
+                            AutomationProperties.Name="IsPaneOpenCheckBox"
+                            Content="IsPaneOpen"
+                            IsChecked="{Binding IsPaneOpen, ElementName=NavView, Mode=TwoWay}"
+                            Margin="5"/>
+                        
+                        <CheckBox
+                            x:Name="IsPaneVisibleCheckBox"
+                            AutomationProperties.Name="IsPaneVisibleCheckBox"
+                            Content="IsPaneVisible"
+                            IsChecked="{Binding IsPaneVisible, ElementName=NavView, Mode=TwoWay}"
+                            Margin="5"/>
+                        
+                        <ComboBox x:Name="CompactPaneLength" Header="Compact Pane Length" AutomationProperties.Name="CompactPaneLenghtComboBox"
+                            SelectionChanged="CompactPaneLength_SelectionChanged"  Margin="5">
+                            <ComboBoxItem Content="0" Tag="0"/>
+                            <ComboBoxItem Content="40" Tag="40" IsSelected="True"/>
+                            <ComboBoxItem Content="48" Tag="48"/>
+                            <ComboBoxItem Content="96" Tag="96"/>
+                        </ComboBox>
+
+                        <ComboBox x:Name="OpenPaneLength" Header="Expanded Pane Length"
+                            SelectionChanged="OpenPaneLength_SelectionChanged" Margin="5">
+                            <ComboBoxItem Content="0" Tag="0"/>
+                            <ComboBoxItem Content="320" Tag="320" IsSelected="True"/>
+                            <ComboBoxItem Content="648" Tag="648"/>
+                        </ComboBox>
+
+                        <ComboBox x:Name="PaneDisplayModeCombobox"
+                                AutomationProperties.Name="PaneDisplayModeCombobox"
+                                Header="PaneDisplayMode"
+                                SelectionChanged="PaneDisplayModeCombobox_SelectionChanged"
+                                Margin="5">
+                            <ComboBoxItem Content="Auto" Tag="Auto"/>
+                            <ComboBoxItem Content="Left" Tag="Left" IsSelected="True"/>
+                            <ComboBoxItem Content="Top" Tag="Top"/>
+                            <ComboBoxItem Content="LeftCompact" Tag="LeftCompact"/>
+                            <ComboBoxItem Content="LeftMinimal" Tag="LeftMinimal"/>
+                        </ComboBox>
+
+                        <CheckBox x:Name="PaneToggleButtonVisiblityCheckbox" AutomationProperties.Name="PaneToggleButtonVisiblityCheckbox"
+                            Content="Show Hamburger Button" Checked="PaneToggleButtonVisiblityCheckbox_Checked" IsChecked="True"
+                            Unchecked="PaneToggleButtonVisiblityCheckbox_Unchecked" Margin="5"/>
+
+                        <CheckBox x:Name="BackButtonVisibilityCheckbox" AutomationProperties.Name="BackButtonVisibilityCheckbox"
+                            Checked="BackButtonVisibilityCheckbox_Checked" Content="Back Visible"
+                            Unchecked="BackButtonVisibilityCheckbox_Unchecked" IsChecked="True" Margin="5"/>
+                        <CheckBox x:Name="BackButtonEnabledCheckbox" AutomationProperties.Name="BackButtonEnabledCheckbox"
+                            Content="Back Enabled" Checked="BackButtonEnabledCheckbox_Checked"
+                            Unchecked="BackButtonEnabledCheckbox_Unchecked" Margin="5"/>
+
+                    </StackPanel>
+                    
+                    <StackPanel Style="{ThemeResource StandardGroupingStackPanel}">
+                        <TextBlock Text="Output" Style="{ThemeResource StandardGroupHeader}"/>
+                        <StackPanel Orientation="Horizontal">
+                            <Button Content="Verify MenuItems offset" AutomationProperties.Name="CheckMenuItemsOffset"
+                                Click="CheckMenuItemsOffset_Click" Margin="0,0,8,0"/>
+                            <CheckBox x:Name="MenuItemsCorrectOffset" AutomationProperties.Name="MenuItemsCorrectOffset"
+                                Content="MenuItems correct offset"/>
+                        </StackPanel>
+                        
+                    </StackPanel>
+                </StackPanel>
+                
+            </muxc:NavigationView.Content>
+        </muxc:NavigationView>
+    </Grid>
+</local:TestPage>
diff --git a/dev/NavigationView/TestUI/NavigationViewCompactPaneLengthTestPage.xaml.cs b/dev/NavigationView/TestUI/NavigationViewCompactPaneLengthTestPage.xaml.cs
new file mode 100644
index 0000000000..7876abd53f
--- /dev/null
+++ b/dev/NavigationView/TestUI/NavigationViewCompactPaneLengthTestPage.xaml.cs
@@ -0,0 +1,109 @@
+// 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 System;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Media;
+using Windows.Foundation;
+
+using NavigationViewPaneDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewPaneDisplayMode;
+using NavigationViewBackButtonVisible = Microsoft.UI.Xaml.Controls.NavigationViewBackButtonVisible;
+using NavigationViewItem = Microsoft.UI.Xaml.Controls.NavigationViewItem;
+
+
+namespace MUXControlsTestApp
+{
+    public sealed partial class NavigationViewCompactPaneLengthTestPage : TestPage
+    {
+        public NavigationViewCompactPaneLengthTestPage()
+        {
+            this.InitializeComponent();
+        }
+        
+        private void CompactPaneLength_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var tag = Convert.ToDouble(((sender as ComboBox).SelectedItem as ComboBoxItem).Tag);
+            NavView.CompactPaneLength = tag;
+        }
+
+        private void OpenPaneLength_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var tag = Convert.ToDouble(((sender as ComboBox).SelectedItem as ComboBoxItem).Tag);
+            NavView.OpenPaneLength = tag;
+        }
+
+        private void PaneToggleButtonVisiblityCheckbox_Checked(object sender, RoutedEventArgs e)
+        {
+            NavView.IsPaneToggleButtonVisible = true;
+        }
+
+        private void PaneToggleButtonVisiblityCheckbox_Unchecked(object sender, RoutedEventArgs e)
+        {
+            NavView.IsPaneToggleButtonVisible = false;
+        }
+
+        private void PaneDisplayModeCombobox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var tag = Convert.ToString(((sender as ComboBox).SelectedItem as ComboBoxItem).Tag);
+            var mode = (NavigationViewPaneDisplayMode)Enum.Parse(typeof(NavigationViewPaneDisplayMode), tag);
+            NavView.PaneDisplayMode = mode;
+        }
+
+        private void BackButtonVisibilityCheckbox_Checked(object sender, RoutedEventArgs e)
+        {
+            NavView.IsBackButtonVisible = NavigationViewBackButtonVisible.Visible;
+        }
+
+        private void BackButtonVisibilityCheckbox_Unchecked(object sender, RoutedEventArgs e)
+        {
+            NavView.IsBackButtonVisible = NavigationViewBackButtonVisible.Collapsed;
+        }
+
+        private void BackButtonEnabledCheckbox_Checked(object sender, RoutedEventArgs e)
+        {
+            NavView.IsBackEnabled = true;
+        }
+
+        private void BackButtonEnabledCheckbox_Unchecked(object sender, RoutedEventArgs e)
+        {
+            NavView.IsBackEnabled = false;
+        }
+
+        private void CheckMenuItemsOffset_Click(object sender, RoutedEventArgs e)
+        {
+            bool allCorrect = true;
+            foreach(var item in NavView.MenuItems)
+            {
+                if(item as NavigationViewItem == null)
+                {
+                    continue;
+                }
+                var transform = GetContentBox(item as NavigationViewItem).TransformToVisual(null) as MatrixTransform;
+                if(Math.Abs(transform.Matrix.OffsetX - NavView.CompactPaneLength) > double.Epsilon)
+                {
+                    allCorrect = false;
+                }
+            }
+            MenuItemsCorrectOffset.IsChecked = allCorrect;
+
+        }
+
+
+        /* Helper functions */
+        private UIElement GetContentBox(NavigationViewItem element)
+        {
+            if(element == null)
+            {
+                return null;
+            }
+            // Path we are using here: NavigationViewItem->RootGrid->ContentGrid
+            var contentGrid = VisualTreeHelper.GetChild(
+                VisualTreeHelper.GetChild(
+                    VisualTreeHelper.GetChild(element, 0), 0), 2);
+            return VisualTreeHelper.GetChild(contentGrid, 1) as UIElement;
+
+        }
+    }
+}
diff --git a/dev/NavigationView/TestUI/NavigationView_TestUI.projitems b/dev/NavigationView/TestUI/NavigationView_TestUI.projitems
index b36babf4d4..efc3e619cf 100644
--- a/dev/NavigationView/TestUI/NavigationView_TestUI.projitems
+++ b/dev/NavigationView/TestUI/NavigationView_TestUI.projitems
@@ -18,6 +18,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)NavigationViewCompactPaneLengthTestPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)NavigationViewIsPaneOpenPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -90,6 +94,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)NavigationViewBlankPage1.xaml.cs">
       <DependentUpon>NavigationViewBlankPage1.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)NavigationViewCompactPaneLengthTestPage.xaml.cs">
+      <DependentUpon>NavigationViewCompactPaneLengthTestPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)NavigationViewIsPaneOpenPage.xaml.cs">
       <DependentUpon>NavigationViewIsPaneOpenPage.xaml</DependentUpon>
     </Compile>

From e5845d27cc27f58d14b67164fe46fbb74d63768f Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Mon, 2 Mar 2020 12:43:30 +0100
Subject: [PATCH 03/14] CR feedback

---
 dev/NavigationView/NavigationView.cpp                 | 11 +----------
 .../NavigationViewTests.cs                            |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
index b2ad59f01c..805b5cc342 100644
--- a/dev/NavigationView/NavigationView.cpp
+++ b/dev/NavigationView/NavigationView.cpp
@@ -3032,7 +3032,7 @@ void NavigationView::OnPropertyChanged(const winrt::DependencyPropertyChangedEve
         // Need to update receiver margins when CompactPaneLength changes
         UpdatePaneShadow();
 
-        // Update pane-button-grid width hwne pane is closed and we are not in minimal
+        // Update pane-button-grid width when pane is closed and we are not in minimal
         if (!IsPaneOpen() && DisplayMode() != winrt::NavigationViewDisplayMode::Minimal)
         {
             if (auto paneButtonGrid = m_paneToggleButtonGrid.try_as<winrt::FrameworkElement>())
@@ -3199,15 +3199,6 @@ void NavigationView::UpdatePaneDisplayMode()
                 thisAsUIElement8.KeyTipTarget(paneToggleButton);
             }
         }
-
-        //if (DisplayMode() == winrt::NavigationViewDisplayMode::Compact)
-        //{
-        //    // Update pane (toggle) button grid's width for button centering
-        //    if (auto paneButtonGrid = m_paneToggleButtonGrid.try_as<winrt::FrameworkElement>())
-        //    {
-        //        paneButtonGrid.Width(CompactPaneLength());
-        //    }
-        //}
     }
     else
     {
diff --git a/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs b/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs
index bf2a6ea1d2..05f8a869c5 100644
--- a/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs
+++ b/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs
@@ -4180,7 +4180,7 @@ public void VerifyEventsReturnExpectedDataTypesMenuItemsSource()
         }
 
         [TestMethod]
-        [TestProperty("TestSuide","D")]
+        [TestProperty("TestSuite","D")]
         public void VerifyIconsRespectCompactPaneLength()
         {
             using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", "NavigationView compact pane length test" }))

From c2e0408bc80a7f0cf0a2120a1455359a85e6abe1 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Mon, 2 Mar 2020 16:27:11 +0100
Subject: [PATCH 04/14] Fix issue with top mode not working

---
 dev/NavigationView/NavigationViewItem.cpp     |  4 +++-
 .../NavigationViewItemPresenter.cpp           | 23 +++++++++++++++----
 .../NavigationViewItemPresenter.h             |  3 ++-
 .../NavigationViewTests.cs                    | 15 +++++++++++-
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/dev/NavigationView/NavigationViewItem.cpp b/dev/NavigationView/NavigationViewItem.cpp
index 0661ed9649..f7996c867b 100644
--- a/dev/NavigationView/NavigationViewItem.cpp
+++ b/dev/NavigationView/NavigationViewItem.cpp
@@ -89,7 +89,9 @@ void NavigationViewItem::UpdateCompactPaneLength()
     if (auto splitView = GetSplitView())
     {
         SetValue(s_CompactPaneLengthProperty, winrt::PropertyValue::CreateDouble(splitView.CompactPaneLength()));
-        GetPresenter()->UpdateCompactPaneLength(splitView.CompactPaneLength());
+
+        // Only update when on left
+        GetPresenter()->UpdateCompactPaneLength(splitView.CompactPaneLength(), IsOnLeftNav());
     }
 }
 
diff --git a/dev/NavigationView/NavigationViewItemPresenter.cpp b/dev/NavigationView/NavigationViewItemPresenter.cpp
index 1dba95a01e..1b320ffb33 100644
--- a/dev/NavigationView/NavigationViewItemPresenter.cpp
+++ b/dev/NavigationView/NavigationViewItemPresenter.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 #include "pch.h"
@@ -23,9 +23,13 @@ void NavigationViewItemPresenter::OnApplyTemplate()
     if (auto navigationViewItem = GetNavigationViewItem())
     {
         navigationViewItem->UpdateVisualStateNoTransition();
-    }
 
-    m_iconBoxColumnDefinition.set(GetTemplateChildT<winrt::ColumnDefinition>(c_iconBoxColumnDefinitionName, controlProtected));
+        // We probably switched displaymode, so restore width now!
+        if (navigationViewItem->GetNavigationView().PaneDisplayMode() != winrt::NavigationViewPaneDisplayMode::Top)
+        {
+            UpdateCompactPaneLength(m_compactPaneLengthValue, true);
+        }
+    }
 }
 
 winrt::UIElement NavigationViewItemPresenter::GetSelectionIndicator()
@@ -62,9 +66,18 @@ NavigationViewItem* NavigationViewItemPresenter::GetNavigationViewItem()
     return navigationViewItem;
 }
 
-void NavigationViewItemPresenter::UpdateCompactPaneLength(double compactPaneLength)
+void NavigationViewItemPresenter::UpdateCompactPaneLength(double compactPaneLength, bool shouldUpdate)
 {
-    if (auto iconGridColumn = m_iconBoxColumnDefinition.try_as<winrt::ColumnDefinition>())
+    if (!this) {
+        // "We" are null, skip
+        return;
+    }
+
+    m_compactPaneLengthValue = compactPaneLength;
+    if (!shouldUpdate) {
+        return;
+    }
+    if (auto iconGridColumn = GetTemplateChildT<winrt::ColumnDefinition>(c_iconBoxColumnDefinitionName, *this))
     {
         auto gridLength = iconGridColumn.Width();
         gridLength.Value = compactPaneLength;
diff --git a/dev/NavigationView/NavigationViewItemPresenter.h b/dev/NavigationView/NavigationViewItemPresenter.h
index 0a5a00ae3b..b5f58f588f 100644
--- a/dev/NavigationView/NavigationViewItemPresenter.h
+++ b/dev/NavigationView/NavigationViewItemPresenter.h
@@ -23,12 +23,13 @@ class NavigationViewItemPresenter:
 
     winrt::UIElement GetSelectionIndicator();
 
-    void UpdateCompactPaneLength(double compactPaneLength);
+    void UpdateCompactPaneLength(double compactPaneLength,bool shouldUpdate);
 
 private:
     NavigationViewItem * GetNavigationViewItem();
 
     tracker_ref<winrt::ColumnDefinition> m_iconBoxColumnDefinition{ this };
+    double m_compactPaneLengthValue = 40;
 
     NavigationViewItemHelper<NavigationViewItemPresenter> m_helper{ this };
 };
diff --git a/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs b/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs
index 05f8a869c5..237591b968 100644
--- a/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs
+++ b/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using Common;
@@ -4187,6 +4187,7 @@ public void VerifyIconsRespectCompactPaneLength()
             {
                 var checkMenuItemsButton = FindElement.ByName("CheckMenuItemsOffset");
                 var compactpaneCheckbox = new ComboBox(FindElement.ByName("CompactPaneLenghtComboBox"));
+                var displayModeToggle = new ComboBox(FindElement.ByName("PaneDisplayModeCombobox"));
                 var currentStatus = new CheckBox(FindElement.ByName("MenuItemsCorrectOffset"));
 
                 checkMenuItemsButton.Click();
@@ -4199,6 +4200,18 @@ public void VerifyIconsRespectCompactPaneLength()
                 checkMenuItemsButton.Click();
                 Wait.ForIdle();
                 Verify.IsTrue(currentStatus.ToggleState == ToggleState.On);
+
+                // Check if changing displaymode to top and then changing length gets used correctly
+                displayModeToggle.SelectItemByName("Top");
+                compactpaneCheckbox.SelectItemByName("48");
+                Wait.ForIdle();
+
+                displayModeToggle.SelectItemByName("Left");
+                Wait.ForIdle();
+
+                checkMenuItemsButton.Click();
+                Wait.ForIdle();
+                Verify.IsTrue(currentStatus.ToggleState == ToggleState.On);
             }
         }
 

From f3df334ad2c1b75b06ca511d55eeded964d2678c Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Mon, 2 Mar 2020 21:50:06 +0100
Subject: [PATCH 05/14] Improve pane button sizing behavior

---
 dev/NavigationView/NavigationView.cpp         | 87 +++++++++++--------
 dev/NavigationView/NavigationView.h           |  3 +-
 dev/NavigationView/NavigationView.xaml        | 14 +--
 .../NavigationViewItemPresenter.h             |  1 -
 .../NavigationView_rs1_themeresources.xaml    |  6 +-
 5 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
index 805b5cc342..028190b098 100644
--- a/dev/NavigationView/NavigationView.cpp
+++ b/dev/NavigationView/NavigationView.cpp
@@ -37,7 +37,7 @@ static constexpr auto c_paneContentGridName = L"PaneContentGrid"sv;
 static constexpr auto c_rootGridName = L"RootGrid"sv;
 static constexpr auto c_contentGridName = L"ContentGrid"sv;
 static constexpr auto c_searchButtonName = L"PaneAutoSuggestButton"sv;
-static constexpr auto c_paneToggleButtonGridName = L"PaneToggleButtonGrid"sv;
+static constexpr auto c_paneToggleButtonIconGridColumnName = L"PaneToggleButtonIconWidthColumn"sv;
 static constexpr auto c_togglePaneTopPadding = L"TogglePaneTopPadding"sv;
 static constexpr auto c_contentPaneTopPadding = L"ContentPaneTopPadding"sv;
 static constexpr auto c_contentLeftPadding = L"ContentLeftPadding"sv;
@@ -260,7 +260,6 @@ void NavigationView::OnApplyTemplate()
     m_paneTitleOnTopPane.set(GetTemplateChildT<winrt::ContentControl>(c_paneTitleOnTopPane, controlProtected));
     m_paneCustomContentOnTopPane.set(GetTemplateChildT<winrt::ContentControl>(c_paneCustomContentOnTopPane, controlProtected));
     m_paneFooterOnTopPane.set(GetTemplateChildT<winrt::ContentControl>(c_paneFooterOnTopPane, controlProtected));
-    m_paneToggleButtonGrid.set(GetTemplateChildT<winrt::Grid>(c_paneToggleButtonGridName, controlProtected));
 
     // Get a pointer to the root SplitView
     if (auto splitView = GetTemplateChildT<winrt::SplitView>(c_rootSplitViewName, controlProtected))
@@ -1120,6 +1119,51 @@ void NavigationView::UpdateIsClosedCompact()
     }
 }
 
+void NavigationView::UpdatePaneButtonsWidths()
+{
+    if (PaneDisplayMode() == winrt::NavigationViewPaneDisplayMode::Top
+        || DisplayMode() == winrt::NavigationViewDisplayMode::Minimal)
+    {
+        if (auto backButton = m_backButton.try_as<winrt::Button>())
+        {
+            backButton.Width(40);
+        }
+        if (auto paneToggleButton = m_paneToggleButton.try_as<winrt::Button>())
+        {
+            paneToggleButton.MinWidth(40);
+        }
+        if(auto paneButton = m_paneToggleButton.try_as<winrt::Button>())
+        {
+            if (auto paneToggleButtonIconColumn = paneButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName).try_as<winrt::ColumnDefinition>())
+            {
+                auto width = paneToggleButtonIconColumn.Width();
+                width.Value = 40;
+                paneToggleButtonIconColumn.Width(width);
+            }
+        }
+    }
+    else
+    {
+        if (auto backButton = m_backButton.try_as<winrt::Button>())
+        {
+            backButton.Width(CompactPaneLength());
+        }
+        if (auto paneToggleButton = m_paneToggleButton.try_as<winrt::Button>())
+        {
+            paneToggleButton.MinWidth(CompactPaneLength());
+        }
+        if (auto paneButton = m_paneToggleButton.try_as<winrt::Button>())
+        {
+            if (auto paneToggleButtonIconColumn = paneButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName).try_as<winrt::ColumnDefinition>())
+            {
+                auto width = paneToggleButtonIconColumn.Width();
+                width.Value = CompactPaneLength();
+                paneToggleButtonIconColumn.Width(width);
+            }
+        }
+    }
+}
+
 void NavigationView::OnBackButtonClicked(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& args)
 {
     auto eventArgs = winrt::make_self<NavigationViewBackRequestedEventArgs>();
@@ -2981,6 +3025,7 @@ void NavigationView::OnPropertyChanged(const winrt::DependencyPropertyChangedEve
         UpdatePaneTitleFrameworkElementParents();
         UpdatePaneVisibility();
         UpdateVisualState();
+        UpdatePaneButtonsWidths();
     }
     else if (property == s_IsPaneVisibleProperty)
     {
@@ -3033,13 +3078,7 @@ void NavigationView::OnPropertyChanged(const winrt::DependencyPropertyChangedEve
         UpdatePaneShadow();
 
         // Update pane-button-grid width when pane is closed and we are not in minimal
-        if (!IsPaneOpen() && DisplayMode() != winrt::NavigationViewDisplayMode::Minimal)
-        {
-            if (auto paneButtonGrid = m_paneToggleButtonGrid.try_as<winrt::FrameworkElement>())
-            {
-                paneButtonGrid.Width(CompactPaneLength());
-            }
-        }
+        UpdatePaneButtonsWidths();
     }
     else if (property == s_IsTitleBarAutoPaddingEnabledProperty)
     {
@@ -3119,35 +3158,6 @@ void NavigationView::OnIsPaneOpenChanged()
             }
         }
     }
-    if (isPaneOpen || DisplayMode() == winrt::NavigationViewDisplayMode::Minimal)
-    {
-        // Opening pane, so we need to clear the button grid width to prevent clipping
-        if (auto paneButtonGrid = m_paneToggleButtonGrid.try_as<winrt::FrameworkElement>())
-        {
-            paneButtonGrid.Width(NAN);
-        }
-    }
-    else
-    {
-        // Closing pane, so we need to set width of button grid so they are centered
-        if (DisplayMode() != winrt::NavigationViewDisplayMode::Minimal)
-        {
-            // Update pane (toggle) button grid's width for button centering
-            if (auto paneButtonGrid = m_paneToggleButtonGrid.try_as<winrt::FrameworkElement>())
-            {
-                paneButtonGrid.Width(CompactPaneLength());
-            }
-        }
-    }
-
-    if (isPaneOpen)
-    {
-        winrt::VisualStateManager::GoToState(*this, L"PaneOpen", false /* usetransition */);
-    }
-    else
-    {
-        winrt::VisualStateManager::GoToState(*this, L"PaneClosed", false /* usetransition */);
-    }
 
     SetPaneToggleButtonAutomationName();
     UpdatePaneTabFocusNavigation();
@@ -3168,6 +3178,7 @@ void NavigationView::OnIsPaneOpenChanged()
             }
         }
     }
+    UpdatePaneButtonsWidths();
 }
 
 void NavigationView::UpdatePaneToggleButtonVisibility()
diff --git a/dev/NavigationView/NavigationView.h b/dev/NavigationView/NavigationView.h
index db1fe01374..e9ea12cada 100644
--- a/dev/NavigationView/NavigationView.h
+++ b/dev/NavigationView/NavigationView.h
@@ -156,6 +156,7 @@ class NavigationView :
 
     void CreateAndHookEventsToSettings(std::wstring_view settingsName);
     void OnIsPaneOpenChanged();
+    void UpdatePaneButtonsWidths();
     void UpdateHeaderVisibility();
     void UpdateHeaderVisibility(winrt::NavigationViewDisplayMode displayMode);
     void UpdatePaneToggleButtonVisibility();
@@ -272,7 +273,7 @@ class NavigationView :
     tracker_ref<winrt::SplitView> m_rootSplitView{ this };
     tracker_ref<winrt::NavigationViewItem> m_settingsItem{ this };
     tracker_ref<winrt::UIElement> m_paneContentGrid{ this };
-    tracker_ref<winrt::FrameworkElement> m_paneToggleButtonGrid{ this };
+    tracker_ref<winrt::ColumnDefinition> m_paneToggleButtonIconGridColumn{ this };
     tracker_ref<winrt::FrameworkElement> m_paneTitleHolderFrameworkElement{ this };
     tracker_ref<winrt::FrameworkElement> m_paneTitleFrameworkElement{ this };
     tracker_ref<winrt::Button> m_paneSearchButton{ this };
diff --git a/dev/NavigationView/NavigationView.xaml b/dev/NavigationView/NavigationView.xaml
index b8ada10b23..066a1177b4 100644
--- a/dev/NavigationView/NavigationView.xaml
+++ b/dev/NavigationView/NavigationView.xaml
@@ -1,4 +1,4 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -75,16 +75,6 @@
                                 </VisualState>
                             </VisualStateGroup>
 
-                            <VisualStateGroup x:Name="PaneOpenStateGroup">
-                                <VisualState x:Name="PaneOpen" />
-
-                                <VisualState x:Name="PaneClosed">
-                                    <VisualState.Setters>
-                                        <Setter Target="ButtonHolderGrid.HorizontalAlignment" Value="Center"/>
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                            
                             <VisualStateGroup x:Name="PaneStateGroup">
                                 <VisualState x:Name="NotClosedCompact" />
                                 <VisualState x:Name="ClosedCompact">
@@ -188,7 +178,7 @@
                                 <Button
                                     x:Name="TogglePaneButton"
                                     Style="{TemplateBinding PaneToggleButtonStyle}"
-                                    AutomationProperties.LandmarkType="Navigation"
+                                    AutomationProperties.LandmarkType="Navigation" HorizontalAlignment="Center"
                                     Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PaneToggleButtonVisibility}"
                                     VerticalAlignment="Top">
                                     <TextBlock
diff --git a/dev/NavigationView/NavigationViewItemPresenter.h b/dev/NavigationView/NavigationViewItemPresenter.h
index b5f58f588f..88ac9ea1f4 100644
--- a/dev/NavigationView/NavigationViewItemPresenter.h
+++ b/dev/NavigationView/NavigationViewItemPresenter.h
@@ -28,7 +28,6 @@ class NavigationViewItemPresenter:
 private:
     NavigationViewItem * GetNavigationViewItem();
 
-    tracker_ref<winrt::ColumnDefinition> m_iconBoxColumnDefinition{ this };
     double m_compactPaneLengthValue = 40;
 
     NavigationViewItemHelper<NavigationViewItemPresenter> m_helper{ this };
diff --git a/dev/NavigationView/NavigationView_rs1_themeresources.xaml b/dev/NavigationView/NavigationView_rs1_themeresources.xaml
index 20f5024a7b..d9e2b6dffb 100644
--- a/dev/NavigationView/NavigationView_rs1_themeresources.xaml
+++ b/dev/NavigationView/NavigationView_rs1_themeresources.xaml
@@ -237,7 +237,7 @@
         <Setter Property="MinHeight" Value="{StaticResource PaneToggleButtonHeight}" />
         <Setter Property="MinWidth" Value="{StaticResource PaneToggleButtonWidth}" />
         <Setter Property="Padding" Value="0" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
@@ -255,7 +255,7 @@
                         Background="{TemplateBinding Background}"
                         HorizontalAlignment="Stretch">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="{ThemeResource PaneToggleButtonWidth}"/>
+                            <ColumnDefinition x:Name="PaneToggleButtonIconWidthColumn" Width="{ThemeResource PaneToggleButtonWidth}"/>
                             <ColumnDefinition Width="*"/>
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
@@ -316,7 +316,7 @@
                             x:Name="IconHost"
                             Width="16"
                             Height="16"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            HorizontalAlignment="Center"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             AutomationProperties.AccessibilityView="Raw">
 

From c1ca10fae2da549b34c4384a5c2a4bf24f9b833e Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Tue, 3 Mar 2020 23:27:18 +0100
Subject: [PATCH 06/14] CR feedback

---
 dev/NavigationView/NavigationView.cpp         | 40 +++++++++----------
 .../NavigationViewItemPresenter.cpp           | 28 ++++++-------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
index 028190b098..4dbd2a3275 100644
--- a/dev/NavigationView/NavigationView.cpp
+++ b/dev/NavigationView/NavigationView.cpp
@@ -1124,41 +1124,41 @@ void NavigationView::UpdatePaneButtonsWidths()
     if (PaneDisplayMode() == winrt::NavigationViewPaneDisplayMode::Top
         || DisplayMode() == winrt::NavigationViewDisplayMode::Minimal)
     {
-        if (auto backButton = m_backButton.try_as<winrt::Button>())
+        if (auto backButton = m_backButton.get())
         {
-            backButton.Width(40);
+            backButton.Width(c_paneToggleButtonWidth);
         }
-        if (auto paneToggleButton = m_paneToggleButton.try_as<winrt::Button>())
+        if (auto paneToggleButton = m_paneToggleButton.get())
         {
-            paneToggleButton.MinWidth(40);
-        }
-        if(auto paneButton = m_paneToggleButton.try_as<winrt::Button>())
-        {
-            if (auto paneToggleButtonIconColumn = paneButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName).try_as<winrt::ColumnDefinition>())
+            paneToggleButton.MinWidth(c_paneToggleButtonWidth);
+            if (auto iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
             {
-                auto width = paneToggleButtonIconColumn.Width();
-                width.Value = 40;
-                paneToggleButtonIconColumn.Width(width);
+                if (auto paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
+                {
+                    auto width = paneToggleButtonIconColumn.Width();
+                    width.Value = c_paneToggleButtonWidth;
+                    paneToggleButtonIconColumn.Width(width);
+                }
             }
         }
     }
     else
     {
-        if (auto backButton = m_backButton.try_as<winrt::Button>())
+        if (auto backButton = m_backButton.get())
         {
             backButton.Width(CompactPaneLength());
         }
-        if (auto paneToggleButton = m_paneToggleButton.try_as<winrt::Button>())
+        if (auto paneToggleButton = m_paneToggleButton.get())
         {
             paneToggleButton.MinWidth(CompactPaneLength());
-        }
-        if (auto paneButton = m_paneToggleButton.try_as<winrt::Button>())
-        {
-            if (auto paneToggleButtonIconColumn = paneButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName).try_as<winrt::ColumnDefinition>())
+            if (auto iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
             {
-                auto width = paneToggleButtonIconColumn.Width();
-                width.Value = CompactPaneLength();
-                paneToggleButtonIconColumn.Width(width);
+                if (auto paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
+                {
+                    auto width = paneToggleButtonIconColumn.Width();
+                    width.Value = CompactPaneLength();
+                    paneToggleButtonIconColumn.Width(width);
+                }
             }
         }
     }
diff --git a/dev/NavigationView/NavigationViewItemPresenter.cpp b/dev/NavigationView/NavigationViewItemPresenter.cpp
index 1b320ffb33..fb514a04f2 100644
--- a/dev/NavigationView/NavigationViewItemPresenter.cpp
+++ b/dev/NavigationView/NavigationViewItemPresenter.cpp
@@ -24,7 +24,8 @@ void NavigationViewItemPresenter::OnApplyTemplate()
     {
         navigationViewItem->UpdateVisualStateNoTransition();
 
-        // We probably switched displaymode, so restore width now!
+
+        // We probably switched displaymode, so restore width now, otherwise the next time we will restore is when the CompactPaneLength changes
         if (navigationViewItem->GetNavigationView().PaneDisplayMode() != winrt::NavigationViewPaneDisplayMode::Top)
         {
             UpdateCompactPaneLength(m_compactPaneLengthValue, true);
@@ -68,19 +69,18 @@ NavigationViewItem* NavigationViewItemPresenter::GetNavigationViewItem()
 
 void NavigationViewItemPresenter::UpdateCompactPaneLength(double compactPaneLength, bool shouldUpdate)
 {
-    if (!this) {
-        // "We" are null, skip
-        return;
-    }
-
-    m_compactPaneLengthValue = compactPaneLength;
-    if (!shouldUpdate) {
-        return;
-    }
-    if (auto iconGridColumn = GetTemplateChildT<winrt::ColumnDefinition>(c_iconBoxColumnDefinitionName, *this))
+    if (this) 
     {
-        auto gridLength = iconGridColumn.Width();
-        gridLength.Value = compactPaneLength;
-        iconGridColumn.Width(gridLength);
+        m_compactPaneLengthValue = compactPaneLength;
+        if (shouldUpdate)
+        {
+            if (auto iconGridColumn = GetTemplateChildT<winrt::ColumnDefinition>(c_iconBoxColumnDefinitionName, *this))
+            {
+                auto gridLength = iconGridColumn.Width();
+                gridLength.Value = compactPaneLength;
+                iconGridColumn.Width(gridLength);
+            }
+        }
     }
+
 }

From 0ad1880da565940784da820201206cf4842fb174 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Wed, 4 Mar 2020 00:09:14 +0100
Subject: [PATCH 07/14] Remove this is null check from presenter

---
 dev/NavigationView/NavigationViewItem.cpp        |  5 ++++-
 .../NavigationViewItemPresenter.cpp              | 16 ++++++----------
 dev/NavigationView/NavigationViewItemPresenter.h |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dev/NavigationView/NavigationViewItem.cpp b/dev/NavigationView/NavigationViewItem.cpp
index f7996c867b..61246db268 100644
--- a/dev/NavigationView/NavigationViewItem.cpp
+++ b/dev/NavigationView/NavigationViewItem.cpp
@@ -91,7 +91,10 @@ void NavigationViewItem::UpdateCompactPaneLength()
         SetValue(s_CompactPaneLengthProperty, winrt::PropertyValue::CreateDouble(splitView.CompactPaneLength()));
 
         // Only update when on left
-        GetPresenter()->UpdateCompactPaneLength(splitView.CompactPaneLength(), IsOnLeftNav());
+        if (auto presenter = GetPresenter())
+        {
+            presenter->UpdateCompactPaneLength(splitView.CompactPaneLength(), IsOnLeftNav());
+        }
     }
 }
 
diff --git a/dev/NavigationView/NavigationViewItemPresenter.cpp b/dev/NavigationView/NavigationViewItemPresenter.cpp
index fb514a04f2..aa5fbbf651 100644
--- a/dev/NavigationView/NavigationViewItemPresenter.cpp
+++ b/dev/NavigationView/NavigationViewItemPresenter.cpp
@@ -69,18 +69,14 @@ NavigationViewItem* NavigationViewItemPresenter::GetNavigationViewItem()
 
 void NavigationViewItemPresenter::UpdateCompactPaneLength(double compactPaneLength, bool shouldUpdate)
 {
-    if (this) 
+    m_compactPaneLengthValue = compactPaneLength;
+    if (shouldUpdate)
     {
-        m_compactPaneLengthValue = compactPaneLength;
-        if (shouldUpdate)
+        if (auto iconGridColumn = GetTemplateChildT<winrt::ColumnDefinition>(c_iconBoxColumnDefinitionName, *this))
         {
-            if (auto iconGridColumn = GetTemplateChildT<winrt::ColumnDefinition>(c_iconBoxColumnDefinitionName, *this))
-            {
-                auto gridLength = iconGridColumn.Width();
-                gridLength.Value = compactPaneLength;
-                iconGridColumn.Width(gridLength);
-            }
+            auto gridLength = iconGridColumn.Width();
+            gridLength.Value = compactPaneLength;
+            iconGridColumn.Width(gridLength);
         }
     }
-
 }
diff --git a/dev/NavigationView/NavigationViewItemPresenter.h b/dev/NavigationView/NavigationViewItemPresenter.h
index 88ac9ea1f4..cd87b7c161 100644
--- a/dev/NavigationView/NavigationViewItemPresenter.h
+++ b/dev/NavigationView/NavigationViewItemPresenter.h
@@ -28,7 +28,7 @@ class NavigationViewItemPresenter:
 private:
     NavigationViewItem * GetNavigationViewItem();
 
-    double m_compactPaneLengthValue = 40;
+    double m_compactPaneLengthValue { 40 };
 
     NavigationViewItemHelper<NavigationViewItemPresenter> m_helper{ this };
 };

From debe51817554da6433b6f2244462ae0dd8ee437f Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Sat, 7 Mar 2020 16:22:52 +0100
Subject: [PATCH 08/14] Add const

---
 dev/NavigationView/NavigationView.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
index 4dbd2a3275..72f5bea0fe 100644
--- a/dev/NavigationView/NavigationView.cpp
+++ b/dev/NavigationView/NavigationView.cpp
@@ -1124,16 +1124,16 @@ void NavigationView::UpdatePaneButtonsWidths()
     if (PaneDisplayMode() == winrt::NavigationViewPaneDisplayMode::Top
         || DisplayMode() == winrt::NavigationViewDisplayMode::Minimal)
     {
-        if (auto backButton = m_backButton.get())
+        if (const auto backButton = m_backButton.get())
         {
             backButton.Width(c_paneToggleButtonWidth);
         }
-        if (auto paneToggleButton = m_paneToggleButton.get())
+        if (const auto paneToggleButton = m_paneToggleButton.get())
         {
             paneToggleButton.MinWidth(c_paneToggleButtonWidth);
-            if (auto iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
+            if (const auto iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
             {
-                if (auto paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
+                if (const auto paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
                 {
                     auto width = paneToggleButtonIconColumn.Width();
                     width.Value = c_paneToggleButtonWidth;
@@ -1144,16 +1144,16 @@ void NavigationView::UpdatePaneButtonsWidths()
     }
     else
     {
-        if (auto backButton = m_backButton.get())
+        if (const auto backButton = m_backButton.get())
         {
             backButton.Width(CompactPaneLength());
         }
-        if (auto paneToggleButton = m_paneToggleButton.get())
+        if (const auto paneToggleButton = m_paneToggleButton.get())
         {
             paneToggleButton.MinWidth(CompactPaneLength());
-            if (auto iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
+            if (const auto iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
             {
-                if (auto paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
+                if (const auto paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
                 {
                     auto width = paneToggleButtonIconColumn.Width();
                     width.Value = CompactPaneLength();

From d0f5ad7347598910fb712d441600813237f1c2b3 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Tue, 24 Mar 2020 01:16:35 +0100
Subject: [PATCH 09/14] Code improvements

---
 dev/NavigationView/NavigationView.cpp | 47 +++++++++------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
index 712abf4d9f..a0ea31163a 100644
--- a/dev/NavigationView/NavigationView.cpp
+++ b/dev/NavigationView/NavigationView.cpp
@@ -1364,44 +1364,29 @@ void NavigationView::UpdateIsClosedCompact()
 
 void NavigationView::UpdatePaneButtonsWidths()
 {
-    if (PaneDisplayMode() == winrt::NavigationViewPaneDisplayMode::Top
-        || DisplayMode() == winrt::NavigationViewDisplayMode::Minimal)
+    auto newButtonWidths = [this]()
     {
-        if (const auto backButton = m_backButton.get())
+        if (DisplayMode() == winrt::NavigationViewDisplayMode::Minimal)
         {
-            backButton.Width(c_paneToggleButtonWidth);
-        }
-        if (const auto paneToggleButton = m_paneToggleButton.get())
-        {
-            paneToggleButton.MinWidth(c_paneToggleButtonWidth);
-            if (const auto iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
-            {
-                if (const auto paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
-                {
-                    auto width = paneToggleButtonIconColumn.Width();
-                    width.Value = c_paneToggleButtonWidth;
-                    paneToggleButtonIconColumn.Width(width);
-                }
-            }
+            return (double)c_paneToggleButtonWidth;
         }
+        return CompactPaneLength();
+    }();
+
+    if (const auto backButton = m_backButton.get())
+    {
+        backButton.Width(newButtonWidths);
     }
-    else
+    if (const auto paneToggleButton = m_paneToggleButton.get())
     {
-        if (const auto backButton = m_backButton.get())
+        paneToggleButton.MinWidth(newButtonWidths);
+        if (const auto iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
         {
-            backButton.Width(CompactPaneLength());
-        }
-        if (const auto paneToggleButton = m_paneToggleButton.get())
-        {
-            paneToggleButton.MinWidth(CompactPaneLength());
-            if (const auto iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
+            if (const auto paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
             {
-                if (const auto paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
-                {
-                    auto width = paneToggleButtonIconColumn.Width();
-                    width.Value = CompactPaneLength();
-                    paneToggleButtonIconColumn.Width(width);
-                }
+                auto width = paneToggleButtonIconColumn.Width();
+                width.Value = newButtonWidths;
+                paneToggleButtonIconColumn.Width(width);
             }
         }
     }

From 4365744f6909a8705fb4d744f5db59e051dc41d0 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Wed, 25 Mar 2020 00:26:04 +0100
Subject: [PATCH 10/14] Switch way of casting

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

diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
index a0ea31163a..338537693a 100644
--- a/dev/NavigationView/NavigationView.cpp
+++ b/dev/NavigationView/NavigationView.cpp
@@ -1368,7 +1368,7 @@ void NavigationView::UpdatePaneButtonsWidths()
     {
         if (DisplayMode() == winrt::NavigationViewDisplayMode::Minimal)
         {
-            return (double)c_paneToggleButtonWidth;
+            return static_cast<double>(c_paneToggleButtonWidth);
         }
         return CompactPaneLength();
     }();

From be51ae1c6b42df09414e3c956f78c996705ecc92 Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Thu, 26 Mar 2020 16:05:03 +0100
Subject: [PATCH 11/14] Update test code to adjust for new presenter template

---
 ...NavigationViewCompactPaneLengthTestPage.xaml.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dev/NavigationView/TestUI/NavigationViewCompactPaneLengthTestPage.xaml.cs b/dev/NavigationView/TestUI/NavigationViewCompactPaneLengthTestPage.xaml.cs
index 7876abd53f..5858fd9c97 100644
--- a/dev/NavigationView/TestUI/NavigationViewCompactPaneLengthTestPage.xaml.cs
+++ b/dev/NavigationView/TestUI/NavigationViewCompactPaneLengthTestPage.xaml.cs
@@ -98,11 +98,15 @@ private UIElement GetContentBox(NavigationViewItem element)
             {
                 return null;
             }
-            // Path we are using here: NavigationViewItem->RootGrid->ContentGrid
-            var contentGrid = VisualTreeHelper.GetChild(
-                VisualTreeHelper.GetChild(
-                    VisualTreeHelper.GetChild(element, 0), 0), 2);
-            return VisualTreeHelper.GetChild(contentGrid, 1) as UIElement;
+            // Path we are using here: NVIGrid->NavigationViewItemPresenter->LayoutRoot
+            // ->PresenterContentRootGrid->ContentGrid->ContentPresenter
+            var elementGrid = VisualTreeHelper.GetChild(element,0);
+            var presenter = VisualTreeHelper.GetChild(elementGrid, 0);
+            var layoutRoot = VisualTreeHelper.GetChild(presenter, 0);
+            var presenterContentRootGrid = VisualTreeHelper.GetChild(layoutRoot, 1);
+            var contentGrid = VisualTreeHelper.GetChild(presenterContentRootGrid, 1);
+            var contentPresenter = VisualTreeHelper.GetChild(contentGrid, 1);
+            return contentPresenter as UIElement;
 
         }
     }

From aea41d6b4589249abf571e955180c27142e342da Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Tue, 31 Mar 2020 22:33:20 +0200
Subject: [PATCH 12/14] CR feedback

---
 dev/NavigationView/NavigationView.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
index 338537693a..779f7af128 100644
--- a/dev/NavigationView/NavigationView.cpp
+++ b/dev/NavigationView/NavigationView.cpp
@@ -1377,12 +1377,12 @@ void NavigationView::UpdatePaneButtonsWidths()
     {
         backButton.Width(newButtonWidths);
     }
-    if (const auto paneToggleButton = m_paneToggleButton.get())
+    if (auto&& paneToggleButton = m_paneToggleButton.get())
     {
         paneToggleButton.MinWidth(newButtonWidths);
-        if (const auto iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
+        if (const auto&& iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
         {
-            if (const auto paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
+            if (const auto&& paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
             {
                 auto width = paneToggleButtonIconColumn.Width();
                 width.Value = newButtonWidths;

From e57ee3ad3889f06f84d4e9e3ad3fac55a8b8e33f Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Wed, 1 Apr 2020 20:42:56 +0200
Subject: [PATCH 13/14] CR feedback

---
 dev/NavigationView/NavigationView.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
index 779f7af128..37cb5c35e2 100644
--- a/dev/NavigationView/NavigationView.cpp
+++ b/dev/NavigationView/NavigationView.cpp
@@ -1373,16 +1373,16 @@ void NavigationView::UpdatePaneButtonsWidths()
         return CompactPaneLength();
     }();
 
-    if (const auto backButton = m_backButton.get())
+    if (auto&& backButton = m_backButton.get())
     {
         backButton.Width(newButtonWidths);
     }
     if (auto&& paneToggleButton = m_paneToggleButton.get())
     {
         paneToggleButton.MinWidth(newButtonWidths);
-        if (const auto&& iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
+        if (auto&& iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
         {
-            if (const auto&& paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
+            if (const auto paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
             {
                 auto width = paneToggleButtonIconColumn.Width();
                 width.Value = newButtonWidths;

From 34fc73069c026723365cc20e9e8ebb87a750bc5b Mon Sep 17 00:00:00 2001
From: Marcel Wagner <marcel.alex.wagner@outlook.com>
Date: Wed, 1 Apr 2020 20:58:05 +0200
Subject: [PATCH 14/14] Update dev/NavigationView/NavigationView.cpp

Co-Authored-By: Stephen L Peters <stpete@microsoft.com>
---
 dev/NavigationView/NavigationView.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
index 37cb5c35e2..939c4e5074 100644
--- a/dev/NavigationView/NavigationView.cpp
+++ b/dev/NavigationView/NavigationView.cpp
@@ -1380,7 +1380,7 @@ void NavigationView::UpdatePaneButtonsWidths()
     if (auto&& paneToggleButton = m_paneToggleButton.get())
     {
         paneToggleButton.MinWidth(newButtonWidths);
-        if (auto&& iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
+        if (const auto iconGridColumnElement = paneToggleButton.GetTemplateChild(c_paneToggleButtonIconGridColumnName))
         {
             if (const auto paneToggleButtonIconColumn = iconGridColumnElement.try_as<winrt::ColumnDefinition>())
             {