From 6bdf738ede7f979f91ffdae782f394c17351d677 Mon Sep 17 00:00:00 2001 From: Karen Lai <7976322+karenbtlai@users.noreply.github.com> Date: Fri, 12 Feb 2021 11:50:57 -0800 Subject: [PATCH] Navigation View Visual Update (#4009) * update brushes * update NavViewItems * navView items visual update * panelToggle and back button * adjust icon width when compact left * fix rebase * update pane closed layout * fix toggleButton cutoff * top nav visual update * fix bad rebase * remove reveal style * revert c_BackButtonHeight changes * add templateSettings properties * update latest style with template setting prop * bind old style to templateSettings * bind NavView item presenter icon column wip * add itemPresenter TemplateSettings and bind to latest style * bind to old style + cleanup * top nav coloring fix * fix failing tests WIP * fix failing tests * fetch new verification files * update verification files * update verificationt files * fix failing tests * fix failing test * fix test * fix syntax --- dev/CommonStyles/TestUI/CompactPage.xaml.cs | 2 +- ...NavigationViewItemPresenter.properties.cpp | 26 + .../NavigationViewItemPresenter.properties.h | 5 + ...emPresenterTemplateSettings.properties.cpp | 80 + ...ItemPresenterTemplateSettings.properties.h | 26 + ...igationViewTemplateSettings.properties.cpp | 52 + ...avigationViewTemplateSettings.properties.h | 10 + .../RevealBrushTests.cs | 1 + dev/NavigationView/NavigationBackButton.xaml | 13 +- ...vigationBackButton_rs1_themeresources.xaml | 4 +- dev/NavigationView/NavigationView.cpp | 25 +- dev/NavigationView/NavigationView.idl | 4 + dev/NavigationView/NavigationView.vcxitems | 4 + dev/NavigationView/NavigationView.xaml | 37 +- .../NavigationViewItemPresenter.cpp | 13 +- .../NavigationViewItemPresenter.h | 2 + .../NavigationViewItemPresenter.idl | 17 + ...ationViewItemPresenterTemplateSettings.cpp | 6 + ...igationViewItemPresenterTemplateSettings.h | 13 + .../CommonTests.cs | 9 +- .../PaneBehaviorTests.cs | 46 +- .../TopModeTests.cs | 1 + .../NavigationView_rs1_themeresources.xaml | 665 +-- ...avigationView_rs1_themeresources_v2.5.xaml | 50 +- .../NavigationView_rs2_themeresources.xaml | 97 +- dev/NavigationView/NavigationView_v2.5.xaml | 4 +- ...ationViewCompactPaneLengthTestPage.xaml.cs | 9 +- .../verification/NavigationViewAuto-4.xml | 574 +- .../verification/NavigationViewAuto-5.xml | 2385 ++++++++ .../verification/NavigationViewAuto-6.xml | 2385 ++++++++ .../verification/NavigationViewAuto-7.xml | 574 +- .../verification/NavigationViewAuto-8.xml | 574 +- .../NavigationViewLeftCompact-4.xml | 560 +- .../NavigationViewLeftCompact-5.xml | 2339 ++++++++ .../NavigationViewLeftCompact-6.xml | 2339 ++++++++ .../NavigationViewLeftCompact-7.xml | 562 +- .../NavigationViewLeftCompact-8.xml | 562 +- .../NavigationViewLeftMinimal-4.xml | 574 +- .../NavigationViewLeftMinimal-5.xml | 2385 ++++++++ .../NavigationViewLeftMinimal-6.xml | 2385 ++++++++ .../NavigationViewLeftMinimal-7.xml | 576 +- .../NavigationViewLeftMinimal-8.xml | 576 +- .../NavigationViewLeftPaneContent-4.xml | 588 +- .../NavigationViewLeftPaneContent-5.xml | 2792 +++++++++ .../NavigationViewLeftPaneContent-6.xml | 2792 +++++++++ .../NavigationViewLeftPaneContent-7.xml | 598 +- .../NavigationViewLeftPaneContent-8.xml | 598 +- .../NavigationViewScrolling-4.xml | 1723 +++--- .../NavigationViewScrolling-5.xml | 5241 +++++++++++++++++ .../NavigationViewScrolling-6.xml | 5241 +++++++++++++++++ .../NavigationViewScrolling-7.xml | 1723 +++--- .../NavigationViewScrolling-8.xml | 1723 +++--- .../verification/NavigationViewTop-4.xml | 291 +- .../verification/NavigationViewTop-5.xml | 1672 ++++++ .../verification/NavigationViewTop-6.xml | 1672 ++++++ .../verification/NavigationViewTop-7.xml | 293 +- .../verification/NavigationViewTop-8.xml | 295 +- .../NavigationViewTopPaneContent-4.xml | 297 +- .../NavigationViewTopPaneContent-5.xml | 2126 +++++++ .../NavigationViewTopPaneContent-6.xml | 2126 +++++++ .../NavigationViewTopPaneContent-7.xml | 305 +- .../NavigationViewTopPaneContent-8.xml | 307 +- ...erifyHeaderContentMarginOnMinimalNav-4.xml | 6 +- ...erifyHeaderContentMarginOnMinimalNav-5.xml | 6 +- ...erifyHeaderContentMarginOnMinimalNav-6.xml | 6 +- ...erifyHeaderContentMarginOnMinimalNav-7.xml | 6 +- ...erifyHeaderContentMarginOnMinimalNav-8.xml | 6 +- ...ifyVerifyHeaderContentMarginOnTopNav-4.xml | 6 +- ...ifyVerifyHeaderContentMarginOnTopNav-5.xml | 6 +- ...ifyVerifyHeaderContentMarginOnTopNav-6.xml | 6 +- ...ifyVerifyHeaderContentMarginOnTopNav-7.xml | 6 +- ...ifyVerifyHeaderContentMarginOnTopNav-8.xml | 6 +- 72 files changed, 45303 insertions(+), 7731 deletions(-) create mode 100644 dev/Generated/NavigationViewItemPresenterTemplateSettings.properties.cpp create mode 100644 dev/Generated/NavigationViewItemPresenterTemplateSettings.properties.h create mode 100644 dev/NavigationView/NavigationViewItemPresenterTemplateSettings.cpp create mode 100644 dev/NavigationView/NavigationViewItemPresenterTemplateSettings.h create mode 100644 test/MUXControlsTestApp/verification/NavigationViewAuto-5.xml create mode 100644 test/MUXControlsTestApp/verification/NavigationViewAuto-6.xml create mode 100644 test/MUXControlsTestApp/verification/NavigationViewLeftCompact-5.xml create mode 100644 test/MUXControlsTestApp/verification/NavigationViewLeftCompact-6.xml create mode 100644 test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-5.xml create mode 100644 test/MUXControlsTestApp/verification/NavigationViewLeftMinimal-6.xml create mode 100644 test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-5.xml create mode 100644 test/MUXControlsTestApp/verification/NavigationViewLeftPaneContent-6.xml create mode 100644 test/MUXControlsTestApp/verification/NavigationViewScrolling-5.xml create mode 100644 test/MUXControlsTestApp/verification/NavigationViewScrolling-6.xml create mode 100644 test/MUXControlsTestApp/verification/NavigationViewTop-5.xml create mode 100644 test/MUXControlsTestApp/verification/NavigationViewTop-6.xml create mode 100644 test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-5.xml create mode 100644 test/MUXControlsTestApp/verification/NavigationViewTopPaneContent-6.xml diff --git a/dev/CommonStyles/TestUI/CompactPage.xaml.cs b/dev/CommonStyles/TestUI/CompactPage.xaml.cs index c9e289d9ef..0799676a49 100644 --- a/dev/CommonStyles/TestUI/CompactPage.xaml.cs +++ b/dev/CommonStyles/TestUI/CompactPage.xaml.cs @@ -75,7 +75,7 @@ private void RunTest_Click(object sender, RoutedEventArgs e) item = TreeView.FindVisualChildByType(); VerifyHeight(simpleVerify, item, 24, "TreeViewItem"); - VerifyHeight(simpleVerify, NavItem1, 32, "NavigationViewItem"); + VerifyHeight(simpleVerify, NavItem1, 36, "NavigationViewItem"); VerifyChildHeight(simpleVerify, TextBox, "BorderElement", 24, "TextBox"); VerifyChildHeight(simpleVerify, PasswordBox, "BorderElement", 24, "PasswordBox"); diff --git a/dev/Generated/NavigationViewItemPresenter.properties.cpp b/dev/Generated/NavigationViewItemPresenter.properties.cpp index 1bcf6fadd8..a3c35256cb 100644 --- a/dev/Generated/NavigationViewItemPresenter.properties.cpp +++ b/dev/Generated/NavigationViewItemPresenter.properties.cpp @@ -14,6 +14,7 @@ namespace winrt::Microsoft::UI::Xaml::Controls::Primitives #include "NavigationViewItemPresenter.g.cpp" GlobalDependencyProperty NavigationViewItemPresenterProperties::s_IconProperty{ nullptr }; +GlobalDependencyProperty NavigationViewItemPresenterProperties::s_TemplateSettingsProperty{ nullptr }; NavigationViewItemPresenterProperties::NavigationViewItemPresenterProperties() { @@ -33,11 +34,23 @@ void NavigationViewItemPresenterProperties::EnsureProperties() ValueHelper::BoxedDefaultValue(), nullptr); } + if (!s_TemplateSettingsProperty) + { + s_TemplateSettingsProperty = + InitializeDependencyProperty( + L"TemplateSettings", + winrt::name_of(), + winrt::name_of(), + false /* isAttached */, + ValueHelper::BoxedDefaultValue(), + nullptr); + } } void NavigationViewItemPresenterProperties::ClearProperties() { s_IconProperty = nullptr; + s_TemplateSettingsProperty = nullptr; } void NavigationViewItemPresenterProperties::Icon(winrt::IconElement const& value) @@ -52,3 +65,16 @@ winrt::IconElement NavigationViewItemPresenterProperties::Icon() { return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_IconProperty)); } + +void NavigationViewItemPresenterProperties::TemplateSettings(winrt::NavigationViewItemPresenterTemplateSettings const& value) +{ + [[gsl::suppress(con)]] + { + static_cast(this)->SetValue(s_TemplateSettingsProperty, ValueHelper::BoxValueIfNecessary(value)); + } +} + +winrt::NavigationViewItemPresenterTemplateSettings NavigationViewItemPresenterProperties::TemplateSettings() +{ + return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_TemplateSettingsProperty)); +} diff --git a/dev/Generated/NavigationViewItemPresenter.properties.h b/dev/Generated/NavigationViewItemPresenter.properties.h index 58e26130e5..4bf56bf1e5 100644 --- a/dev/Generated/NavigationViewItemPresenter.properties.h +++ b/dev/Generated/NavigationViewItemPresenter.properties.h @@ -12,9 +12,14 @@ class NavigationViewItemPresenterProperties void Icon(winrt::IconElement const& value); winrt::IconElement Icon(); + void TemplateSettings(winrt::NavigationViewItemPresenterTemplateSettings const& value); + winrt::NavigationViewItemPresenterTemplateSettings TemplateSettings(); + static winrt::DependencyProperty IconProperty() { return s_IconProperty; } + static winrt::DependencyProperty TemplateSettingsProperty() { return s_TemplateSettingsProperty; } static GlobalDependencyProperty s_IconProperty; + static GlobalDependencyProperty s_TemplateSettingsProperty; static void EnsureProperties(); static void ClearProperties(); diff --git a/dev/Generated/NavigationViewItemPresenterTemplateSettings.properties.cpp b/dev/Generated/NavigationViewItemPresenterTemplateSettings.properties.cpp new file mode 100644 index 0000000000..acfcf1f296 --- /dev/null +++ b/dev/Generated/NavigationViewItemPresenterTemplateSettings.properties.cpp @@ -0,0 +1,80 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen +#include "pch.h" +#include "common.h" +#include "NavigationViewItemPresenterTemplateSettings.h" + +namespace winrt::Microsoft::UI::Xaml::Controls::Primitives +{ + CppWinRTActivatableClassWithDPFactory(NavigationViewItemPresenterTemplateSettings) +} + +#include "NavigationViewItemPresenterTemplateSettings.g.cpp" + +GlobalDependencyProperty NavigationViewItemPresenterTemplateSettingsProperties::s_IconColumnWidthProperty{ nullptr }; +GlobalDependencyProperty NavigationViewItemPresenterTemplateSettingsProperties::s_LatestIconColumnWidthProperty{ nullptr }; + +NavigationViewItemPresenterTemplateSettingsProperties::NavigationViewItemPresenterTemplateSettingsProperties() +{ + EnsureProperties(); +} + +void NavigationViewItemPresenterTemplateSettingsProperties::EnsureProperties() +{ + if (!s_IconColumnWidthProperty) + { + s_IconColumnWidthProperty = + InitializeDependencyProperty( + L"IconColumnWidth", + winrt::name_of(), + winrt::name_of(), + false /* isAttached */, + ValueHelper::BoxedDefaultValue(), + nullptr); + } + if (!s_LatestIconColumnWidthProperty) + { + s_LatestIconColumnWidthProperty = + InitializeDependencyProperty( + L"LatestIconColumnWidth", + winrt::name_of(), + winrt::name_of(), + false /* isAttached */, + ValueHelper::BoxedDefaultValue(), + nullptr); + } +} + +void NavigationViewItemPresenterTemplateSettingsProperties::ClearProperties() +{ + s_IconColumnWidthProperty = nullptr; + s_LatestIconColumnWidthProperty = nullptr; +} + +void NavigationViewItemPresenterTemplateSettingsProperties::IconColumnWidth(double value) +{ + [[gsl::suppress(con)]] + { + static_cast(this)->SetValue(s_IconColumnWidthProperty, ValueHelper::BoxValueIfNecessary(value)); + } +} + +double NavigationViewItemPresenterTemplateSettingsProperties::IconColumnWidth() +{ + return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_IconColumnWidthProperty)); +} + +void NavigationViewItemPresenterTemplateSettingsProperties::LatestIconColumnWidth(double value) +{ + [[gsl::suppress(con)]] + { + static_cast(this)->SetValue(s_LatestIconColumnWidthProperty, ValueHelper::BoxValueIfNecessary(value)); + } +} + +double NavigationViewItemPresenterTemplateSettingsProperties::LatestIconColumnWidth() +{ + return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_LatestIconColumnWidthProperty)); +} diff --git a/dev/Generated/NavigationViewItemPresenterTemplateSettings.properties.h b/dev/Generated/NavigationViewItemPresenterTemplateSettings.properties.h new file mode 100644 index 0000000000..d5c8dd7e08 --- /dev/null +++ b/dev/Generated/NavigationViewItemPresenterTemplateSettings.properties.h @@ -0,0 +1,26 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +// DO NOT EDIT! This file was generated by CustomTasks.DependencyPropertyCodeGen +#pragma once + +class NavigationViewItemPresenterTemplateSettingsProperties +{ +public: + NavigationViewItemPresenterTemplateSettingsProperties(); + + void IconColumnWidth(double value); + double IconColumnWidth(); + + void LatestIconColumnWidth(double value); + double LatestIconColumnWidth(); + + static winrt::DependencyProperty IconColumnWidthProperty() { return s_IconColumnWidthProperty; } + static winrt::DependencyProperty LatestIconColumnWidthProperty() { return s_LatestIconColumnWidthProperty; } + + static GlobalDependencyProperty s_IconColumnWidthProperty; + static GlobalDependencyProperty s_LatestIconColumnWidthProperty; + + static void EnsureProperties(); + static void ClearProperties(); +}; diff --git a/dev/Generated/NavigationViewTemplateSettings.properties.cpp b/dev/Generated/NavigationViewTemplateSettings.properties.cpp index 6f25fabec4..cb521649da 100644 --- a/dev/Generated/NavigationViewTemplateSettings.properties.cpp +++ b/dev/Generated/NavigationViewTemplateSettings.properties.cpp @@ -14,8 +14,10 @@ namespace winrt::Microsoft::UI::Xaml::Controls #include "NavigationViewTemplateSettings.g.cpp" GlobalDependencyProperty NavigationViewTemplateSettingsProperties::s_BackButtonVisibilityProperty{ nullptr }; +GlobalDependencyProperty NavigationViewTemplateSettingsProperties::s_LatestPaneButtonWidthProperty{ nullptr }; GlobalDependencyProperty NavigationViewTemplateSettingsProperties::s_LeftPaneVisibilityProperty{ nullptr }; GlobalDependencyProperty NavigationViewTemplateSettingsProperties::s_OverflowButtonVisibilityProperty{ nullptr }; +GlobalDependencyProperty NavigationViewTemplateSettingsProperties::s_PaneButtonWidthProperty{ nullptr }; GlobalDependencyProperty NavigationViewTemplateSettingsProperties::s_PaneToggleButtonVisibilityProperty{ nullptr }; GlobalDependencyProperty NavigationViewTemplateSettingsProperties::s_SingleSelectionFollowsFocusProperty{ nullptr }; GlobalDependencyProperty NavigationViewTemplateSettingsProperties::s_TopPaddingProperty{ nullptr }; @@ -39,6 +41,17 @@ void NavigationViewTemplateSettingsProperties::EnsureProperties() ValueHelper::BoxValueIfNecessary(winrt::Visibility::Collapsed), nullptr); } + if (!s_LatestPaneButtonWidthProperty) + { + s_LatestPaneButtonWidthProperty = + InitializeDependencyProperty( + L"LatestPaneButtonWidth", + winrt::name_of(), + winrt::name_of(), + false /* isAttached */, + ValueHelper::BoxedDefaultValue(), + nullptr); + } if (!s_LeftPaneVisibilityProperty) { s_LeftPaneVisibilityProperty = @@ -61,6 +74,17 @@ void NavigationViewTemplateSettingsProperties::EnsureProperties() ValueHelper::BoxValueIfNecessary(winrt::Visibility::Collapsed), nullptr); } + if (!s_PaneButtonWidthProperty) + { + s_PaneButtonWidthProperty = + InitializeDependencyProperty( + L"PaneButtonWidth", + winrt::name_of(), + winrt::name_of(), + false /* isAttached */, + ValueHelper::BoxedDefaultValue(), + nullptr); + } if (!s_PaneToggleButtonVisibilityProperty) { s_PaneToggleButtonVisibilityProperty = @@ -110,8 +134,10 @@ void NavigationViewTemplateSettingsProperties::EnsureProperties() void NavigationViewTemplateSettingsProperties::ClearProperties() { s_BackButtonVisibilityProperty = nullptr; + s_LatestPaneButtonWidthProperty = nullptr; s_LeftPaneVisibilityProperty = nullptr; s_OverflowButtonVisibilityProperty = nullptr; + s_PaneButtonWidthProperty = nullptr; s_PaneToggleButtonVisibilityProperty = nullptr; s_SingleSelectionFollowsFocusProperty = nullptr; s_TopPaddingProperty = nullptr; @@ -131,6 +157,19 @@ winrt::Visibility NavigationViewTemplateSettingsProperties::BackButtonVisibility return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_BackButtonVisibilityProperty)); } +void NavigationViewTemplateSettingsProperties::LatestPaneButtonWidth(double value) +{ + [[gsl::suppress(con)]] + { + static_cast(this)->SetValue(s_LatestPaneButtonWidthProperty, ValueHelper::BoxValueIfNecessary(value)); + } +} + +double NavigationViewTemplateSettingsProperties::LatestPaneButtonWidth() +{ + return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_LatestPaneButtonWidthProperty)); +} + void NavigationViewTemplateSettingsProperties::LeftPaneVisibility(winrt::Visibility const& value) { [[gsl::suppress(con)]] @@ -157,6 +196,19 @@ winrt::Visibility NavigationViewTemplateSettingsProperties::OverflowButtonVisibi return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_OverflowButtonVisibilityProperty)); } +void NavigationViewTemplateSettingsProperties::PaneButtonWidth(double value) +{ + [[gsl::suppress(con)]] + { + static_cast(this)->SetValue(s_PaneButtonWidthProperty, ValueHelper::BoxValueIfNecessary(value)); + } +} + +double NavigationViewTemplateSettingsProperties::PaneButtonWidth() +{ + return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_PaneButtonWidthProperty)); +} + void NavigationViewTemplateSettingsProperties::PaneToggleButtonVisibility(winrt::Visibility const& value) { [[gsl::suppress(con)]] diff --git a/dev/Generated/NavigationViewTemplateSettings.properties.h b/dev/Generated/NavigationViewTemplateSettings.properties.h index f21bb01cf8..063ec3a59c 100644 --- a/dev/Generated/NavigationViewTemplateSettings.properties.h +++ b/dev/Generated/NavigationViewTemplateSettings.properties.h @@ -12,12 +12,18 @@ class NavigationViewTemplateSettingsProperties void BackButtonVisibility(winrt::Visibility const& value); winrt::Visibility BackButtonVisibility(); + void LatestPaneButtonWidth(double value); + double LatestPaneButtonWidth(); + void LeftPaneVisibility(winrt::Visibility const& value); winrt::Visibility LeftPaneVisibility(); void OverflowButtonVisibility(winrt::Visibility const& value); winrt::Visibility OverflowButtonVisibility(); + void PaneButtonWidth(double value); + double PaneButtonWidth(); + void PaneToggleButtonVisibility(winrt::Visibility const& value); winrt::Visibility PaneToggleButtonVisibility(); @@ -31,16 +37,20 @@ class NavigationViewTemplateSettingsProperties winrt::Visibility TopPaneVisibility(); static winrt::DependencyProperty BackButtonVisibilityProperty() { return s_BackButtonVisibilityProperty; } + static winrt::DependencyProperty LatestPaneButtonWidthProperty() { return s_LatestPaneButtonWidthProperty; } static winrt::DependencyProperty LeftPaneVisibilityProperty() { return s_LeftPaneVisibilityProperty; } static winrt::DependencyProperty OverflowButtonVisibilityProperty() { return s_OverflowButtonVisibilityProperty; } + static winrt::DependencyProperty PaneButtonWidthProperty() { return s_PaneButtonWidthProperty; } static winrt::DependencyProperty PaneToggleButtonVisibilityProperty() { return s_PaneToggleButtonVisibilityProperty; } static winrt::DependencyProperty SingleSelectionFollowsFocusProperty() { return s_SingleSelectionFollowsFocusProperty; } static winrt::DependencyProperty TopPaddingProperty() { return s_TopPaddingProperty; } static winrt::DependencyProperty TopPaneVisibilityProperty() { return s_TopPaneVisibilityProperty; } static GlobalDependencyProperty s_BackButtonVisibilityProperty; + static GlobalDependencyProperty s_LatestPaneButtonWidthProperty; static GlobalDependencyProperty s_LeftPaneVisibilityProperty; static GlobalDependencyProperty s_OverflowButtonVisibilityProperty; + static GlobalDependencyProperty s_PaneButtonWidthProperty; static GlobalDependencyProperty s_PaneToggleButtonVisibilityProperty; static GlobalDependencyProperty s_SingleSelectionFollowsFocusProperty; static GlobalDependencyProperty s_TopPaddingProperty; diff --git a/dev/Materials/Reveal/InteractionTests/Reveal_InteractionTests/RevealBrushTests.cs b/dev/Materials/Reveal/InteractionTests/Reveal_InteractionTests/RevealBrushTests.cs index 2f5aef977e..0281e77570 100644 --- a/dev/Materials/Reveal/InteractionTests/Reveal_InteractionTests/RevealBrushTests.cs +++ b/dev/Materials/Reveal/InteractionTests/Reveal_InteractionTests/RevealBrushTests.cs @@ -629,6 +629,7 @@ public void CoreWindowEventsTests() } [TestMethod] + [TestProperty("Ignore", "True")] // Disabling as Reveal Brush is being deprecated public void RevealBrushFromMarkup() { if (PlatformConfiguration.IsOSVersionLessThan(OSVersion.Redstone5)) diff --git a/dev/NavigationView/NavigationBackButton.xaml b/dev/NavigationView/NavigationBackButton.xaml index 3c249f866f..aafd6b6766 100644 --- a/dev/NavigationView/NavigationBackButton.xaml +++ b/dev/NavigationView/NavigationBackButton.xaml @@ -1,11 +1,13 @@  + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" + xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"> - - - -