From d015fca2df9a6e9cb0c13d4289bafac9b3e98a40 Mon Sep 17 00:00:00 2001 From: Karen Lai Date: Wed, 3 Nov 2021 11:18:40 -0700 Subject: [PATCH 1/2] ensure templatesettings > 0 --- dev/NavigationView/NavigationView.cpp | 2 +- dev/NavigationView/NavigationViewItemPresenter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 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)); } } From 4e4ad64d40a5d806fd30695a53ea69e5a693ed03 Mon Sep 17 00:00:00 2001 From: Karen Lai Date: Wed, 3 Nov 2021 11:19:33 -0700 Subject: [PATCH 2/2] re-enable failed tests --- .../NavigationView_InteractionTests/PaneBehaviorTests.cs | 2 -- 1 file changed, 2 deletions(-) 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" }))