NavView IsPaneVisible Fix (#6227)

* ensure templatesettings > 0 * re-enable failed tests
microsoft · Nov 5, 2021 · 3f6310d · 3f6310d
1 parent 94c2d04
commit 3f6310d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp
@@ -1820,7 +1820,7 @@ void NavigationView::UpdatePaneButtonsWidths()
     }();
 
     templateSettings->PaneToggleButtonWidth(newButtonWidths);
-    templateSettings->SmallerPaneToggleButtonWidth(newButtonWidths - 8);
+    templateSettings->SmallerPaneToggleButtonWidth(std::max(0.0, newButtonWidths - 8));
 }
 
 void NavigationView::OnBackButtonClicked(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& args)

diff --git a/dev/NavigationView/NavigationViewItemPresenter.cpp b/dev/NavigationView/NavigationViewItemPresenter.cpp
@@ -140,7 +140,7 @@ void NavigationViewItemPresenter::UpdateCompactPaneLength(double compactPaneLeng
         const auto gridLength = compactPaneLength;
 
         templateSettings->IconWidth(gridLength);
-        templateSettings->SmallerIconWidth(gridLength - 8);
+        templateSettings->SmallerIconWidth(std::max(0.0, gridLength - 8));
     }
 }
 

diff --git a/dev/NavigationView/NavigationView_InteractionTests/PaneBehaviorTests.cs b/dev/NavigationView/NavigationView_InteractionTests/PaneBehaviorTests.cs
@@ -572,7 +572,6 @@ public void PaneDisplayModeLeftLeftCompactLeftMinimalTest()
         }
 
         [TestMethod]
-        [TestProperty("Ignore", "True")] // Disabled as per tracking issue #3125 and internal issue 19342138
         public void EnsurePaneCanBeHidden()
         {
             using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", "NavigationView Test" }))
@@ -589,7 +588,6 @@ public void EnsurePaneCanBeHidden()
         }
 
         [TestMethod]
-        [TestProperty("Ignore", "True")] // Disabled as per tracking issue #3125 and internal issue 19342138
         public void EnsurePaneCanBeHiddenWithFixedWindowSize()
         {
             using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", "NavigationView Test" }))