Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NavView IsPaneVisible Fix #6227

Merged
merged 2 commits into from
Nov 5, 2021
Merged

NavView IsPaneVisible Fix #6227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d015fca
ensure templatesettings > 0
karkarl Nov 3, 2021
4e4ad64
re-enable failed tests
karkarl Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/NavigationView/NavigationView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion dev/NavigationView/NavigationViewItemPresenter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down
2 changes: 0 additions & 2 deletions dev/NavigationView/NavigationView_InteractionTests/PaneBehaviorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }))
Expand All @@ -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" }))
Expand Down