From 3f6310d4fd24a9a7fab4535b67e5de89e60b04f9 Mon Sep 17 00:00:00 2001 From: Karen Lai <7976322+karenbtlai@users.noreply.github.com> Date: Fri, 5 Nov 2021 10:00:58 -0700 Subject: [PATCH] NavView IsPaneVisible Fix (#6227) * ensure templatesettings > 0 * re-enable failed tests --- dev/NavigationView/NavigationView.cpp | 2 +- dev/NavigationView/NavigationViewItemPresenter.cpp | 2 +- .../NavigationView_InteractionTests/PaneBehaviorTests.cs | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp index 30fb5cab3d..baea367981 100644 --- 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 index 45f2f0ab1d..aca8134c5e 100644 --- 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 index 2ffce8159b..ef53dd22e8 100755 --- 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" }))