diff --git a/dev/Generated/NavigationView.properties.cpp b/dev/Generated/NavigationView.properties.cpp index 9c90ee3b07..a7c87f1ea7 100644 --- a/dev/Generated/NavigationView.properties.cpp +++ b/dev/Generated/NavigationView.properties.cpp @@ -51,7 +51,9 @@ GlobalDependencyProperty NavigationViewProperties::s_TemplateSettingsProperty{ n NavigationViewProperties::NavigationViewProperties() : m_backRequestedEventSource{static_cast(this)} + , m_collapsedEventSource{static_cast(this)} , m_displayModeChangedEventSource{static_cast(this)} + , m_expandingEventSource{static_cast(this)} , m_itemInvokedEventSource{static_cast(this)} , m_paneClosedEventSource{static_cast(this)} , m_paneClosingEventSource{static_cast(this)} @@ -1146,6 +1148,16 @@ void NavigationViewProperties::BackRequested(winrt::event_token const& token) m_backRequestedEventSource.remove(token); } +winrt::event_token NavigationViewProperties::Collapsed(winrt::TypedEventHandler const& value) +{ + return m_collapsedEventSource.add(value); +} + +void NavigationViewProperties::Collapsed(winrt::event_token const& token) +{ + m_collapsedEventSource.remove(token); +} + winrt::event_token NavigationViewProperties::DisplayModeChanged(winrt::TypedEventHandler const& value) { return m_displayModeChangedEventSource.add(value); @@ -1156,6 +1168,16 @@ void NavigationViewProperties::DisplayModeChanged(winrt::event_token const& toke m_displayModeChangedEventSource.remove(token); } +winrt::event_token NavigationViewProperties::Expanding(winrt::TypedEventHandler const& value) +{ + return m_expandingEventSource.add(value); +} + +void NavigationViewProperties::Expanding(winrt::event_token const& token) +{ + m_expandingEventSource.remove(token); +} + winrt::event_token NavigationViewProperties::ItemInvoked(winrt::TypedEventHandler const& value) { return m_itemInvokedEventSource.add(value); diff --git a/dev/Generated/NavigationView.properties.h b/dev/Generated/NavigationView.properties.h index 9b03c32359..c9e237d508 100644 --- a/dev/Generated/NavigationView.properties.h +++ b/dev/Generated/NavigationView.properties.h @@ -188,8 +188,12 @@ class NavigationViewProperties winrt::event_token BackRequested(winrt::TypedEventHandler const& value); void BackRequested(winrt::event_token const& token); + winrt::event_token Collapsed(winrt::TypedEventHandler const& value); + void Collapsed(winrt::event_token const& token); winrt::event_token DisplayModeChanged(winrt::TypedEventHandler const& value); void DisplayModeChanged(winrt::event_token const& token); + winrt::event_token Expanding(winrt::TypedEventHandler const& value); + void Expanding(winrt::event_token const& token); winrt::event_token ItemInvoked(winrt::TypedEventHandler const& value); void ItemInvoked(winrt::event_token const& token); winrt::event_token PaneClosed(winrt::TypedEventHandler const& value); @@ -204,7 +208,9 @@ class NavigationViewProperties void SelectionChanged(winrt::event_token const& token); event_source> m_backRequestedEventSource; + event_source> m_collapsedEventSource; event_source> m_displayModeChangedEventSource; + event_source> m_expandingEventSource; event_source> m_itemInvokedEventSource; event_source> m_paneClosedEventSource; event_source> m_paneClosingEventSource; diff --git a/dev/Generated/NavigationViewItem.properties.cpp b/dev/Generated/NavigationViewItem.properties.cpp index 48af7c946e..05ba98900b 100644 --- a/dev/Generated/NavigationViewItem.properties.cpp +++ b/dev/Generated/NavigationViewItem.properties.cpp @@ -14,7 +14,12 @@ namespace winrt::Microsoft::UI::Xaml::Controls #include "NavigationViewItem.g.cpp" GlobalDependencyProperty NavigationViewItemProperties::s_CompactPaneLengthProperty{ nullptr }; +GlobalDependencyProperty NavigationViewItemProperties::s_HasUnrealizedChildrenProperty{ nullptr }; GlobalDependencyProperty NavigationViewItemProperties::s_IconProperty{ nullptr }; +GlobalDependencyProperty NavigationViewItemProperties::s_IsChildSelectedProperty{ nullptr }; +GlobalDependencyProperty NavigationViewItemProperties::s_IsExpandedProperty{ nullptr }; +GlobalDependencyProperty NavigationViewItemProperties::s_MenuItemsProperty{ nullptr }; +GlobalDependencyProperty NavigationViewItemProperties::s_MenuItemsSourceProperty{ nullptr }; GlobalDependencyProperty NavigationViewItemProperties::s_SelectsOnInvokedProperty{ nullptr }; NavigationViewItemProperties::NavigationViewItemProperties() @@ -24,6 +29,7 @@ NavigationViewItemProperties::NavigationViewItemProperties() void NavigationViewItemProperties::EnsureProperties() { + NavigationViewItemBase::EnsureProperties(); if (!s_CompactPaneLengthProperty) { s_CompactPaneLengthProperty = @@ -35,6 +41,17 @@ void NavigationViewItemProperties::EnsureProperties() ValueHelper::BoxValueIfNecessary(48.0), nullptr); } + if (!s_HasUnrealizedChildrenProperty) + { + s_HasUnrealizedChildrenProperty = + InitializeDependencyProperty( + L"HasUnrealizedChildren", + winrt::name_of(), + winrt::name_of(), + false /* isAttached */, + ValueHelper::BoxValueIfNecessary(false), + winrt::PropertyChangedCallback(&OnHasUnrealizedChildrenPropertyChanged)); + } if (!s_IconProperty) { s_IconProperty = @@ -46,6 +63,50 @@ void NavigationViewItemProperties::EnsureProperties() ValueHelper::BoxedDefaultValue(), winrt::PropertyChangedCallback(&OnIconPropertyChanged)); } + if (!s_IsChildSelectedProperty) + { + s_IsChildSelectedProperty = + InitializeDependencyProperty( + L"IsChildSelected", + winrt::name_of(), + winrt::name_of(), + false /* isAttached */, + ValueHelper::BoxValueIfNecessary(false), + nullptr); + } + if (!s_IsExpandedProperty) + { + s_IsExpandedProperty = + InitializeDependencyProperty( + L"IsExpanded", + winrt::name_of(), + winrt::name_of(), + false /* isAttached */, + ValueHelper::BoxValueIfNecessary(false), + nullptr); + } + if (!s_MenuItemsProperty) + { + s_MenuItemsProperty = + InitializeDependencyProperty( + L"MenuItems", + winrt::name_of>(), + winrt::name_of(), + false /* isAttached */, + ValueHelper>::BoxedDefaultValue(), + winrt::PropertyChangedCallback(&OnMenuItemsPropertyChanged)); + } + if (!s_MenuItemsSourceProperty) + { + s_MenuItemsSourceProperty = + InitializeDependencyProperty( + L"MenuItemsSource", + winrt::name_of(), + winrt::name_of(), + false /* isAttached */, + ValueHelper::BoxedDefaultValue(), + winrt::PropertyChangedCallback(&OnMenuItemsSourcePropertyChanged)); + } if (!s_SelectsOnInvokedProperty) { s_SelectsOnInvokedProperty = @@ -62,8 +123,22 @@ void NavigationViewItemProperties::EnsureProperties() void NavigationViewItemProperties::ClearProperties() { s_CompactPaneLengthProperty = nullptr; + s_HasUnrealizedChildrenProperty = nullptr; s_IconProperty = nullptr; + s_IsChildSelectedProperty = nullptr; + s_IsExpandedProperty = nullptr; + s_MenuItemsProperty = nullptr; + s_MenuItemsSourceProperty = nullptr; s_SelectsOnInvokedProperty = nullptr; + NavigationViewItemBase::ClearProperties(); +} + +void NavigationViewItemProperties::OnHasUnrealizedChildrenPropertyChanged( + winrt::DependencyObject const& sender, + winrt::DependencyPropertyChangedEventArgs const& args) +{ + auto owner = sender.as(); + winrt::get_self(owner)->OnHasUnrealizedChildrenPropertyChanged(args); } void NavigationViewItemProperties::OnIconPropertyChanged( @@ -74,6 +149,22 @@ void NavigationViewItemProperties::OnIconPropertyChanged( winrt::get_self(owner)->OnIconPropertyChanged(args); } +void NavigationViewItemProperties::OnMenuItemsPropertyChanged( + winrt::DependencyObject const& sender, + winrt::DependencyPropertyChangedEventArgs const& args) +{ + auto owner = sender.as(); + winrt::get_self(owner)->OnMenuItemsPropertyChanged(args); +} + +void NavigationViewItemProperties::OnMenuItemsSourcePropertyChanged( + winrt::DependencyObject const& sender, + winrt::DependencyPropertyChangedEventArgs const& args) +{ + auto owner = sender.as(); + winrt::get_self(owner)->OnMenuItemsSourcePropertyChanged(args); +} + void NavigationViewItemProperties::CompactPaneLength(double value) { static_cast(this)->SetValue(s_CompactPaneLengthProperty, ValueHelper::BoxValueIfNecessary(value)); @@ -84,6 +175,16 @@ double NavigationViewItemProperties::CompactPaneLength() return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_CompactPaneLengthProperty)); } +void NavigationViewItemProperties::HasUnrealizedChildren(bool value) +{ + static_cast(this)->SetValue(s_HasUnrealizedChildrenProperty, ValueHelper::BoxValueIfNecessary(value)); +} + +bool NavigationViewItemProperties::HasUnrealizedChildren() +{ + return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_HasUnrealizedChildrenProperty)); +} + void NavigationViewItemProperties::Icon(winrt::IconElement const& value) { static_cast(this)->SetValue(s_IconProperty, ValueHelper::BoxValueIfNecessary(value)); @@ -94,6 +195,46 @@ winrt::IconElement NavigationViewItemProperties::Icon() return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_IconProperty)); } +void NavigationViewItemProperties::IsChildSelected(bool value) +{ + static_cast(this)->SetValue(s_IsChildSelectedProperty, ValueHelper::BoxValueIfNecessary(value)); +} + +bool NavigationViewItemProperties::IsChildSelected() +{ + return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_IsChildSelectedProperty)); +} + +void NavigationViewItemProperties::IsExpanded(bool value) +{ + static_cast(this)->SetValue(s_IsExpandedProperty, ValueHelper::BoxValueIfNecessary(value)); +} + +bool NavigationViewItemProperties::IsExpanded() +{ + return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_IsExpandedProperty)); +} + +void NavigationViewItemProperties::MenuItems(winrt::IVector const& value) +{ + static_cast(this)->SetValue(s_MenuItemsProperty, ValueHelper>::BoxValueIfNecessary(value)); +} + +winrt::IVector NavigationViewItemProperties::MenuItems() +{ + return ValueHelper>::CastOrUnbox(static_cast(this)->GetValue(s_MenuItemsProperty)); +} + +void NavigationViewItemProperties::MenuItemsSource(winrt::IInspectable const& value) +{ + static_cast(this)->SetValue(s_MenuItemsSourceProperty, ValueHelper::BoxValueIfNecessary(value)); +} + +winrt::IInspectable NavigationViewItemProperties::MenuItemsSource() +{ + return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_MenuItemsSourceProperty)); +} + void NavigationViewItemProperties::SelectsOnInvoked(bool value) { static_cast(this)->SetValue(s_SelectsOnInvokedProperty, ValueHelper::BoxValueIfNecessary(value)); diff --git a/dev/Generated/NavigationViewItem.properties.h b/dev/Generated/NavigationViewItem.properties.h index 55e92d34a2..09cc664b65 100644 --- a/dev/Generated/NavigationViewItem.properties.h +++ b/dev/Generated/NavigationViewItem.properties.h @@ -12,24 +12,61 @@ class NavigationViewItemProperties void CompactPaneLength(double value); double CompactPaneLength(); + void HasUnrealizedChildren(bool value); + bool HasUnrealizedChildren(); + void Icon(winrt::IconElement const& value); winrt::IconElement Icon(); + void IsChildSelected(bool value); + bool IsChildSelected(); + + void IsExpanded(bool value); + bool IsExpanded(); + + void MenuItems(winrt::IVector const& value); + winrt::IVector MenuItems(); + + void MenuItemsSource(winrt::IInspectable const& value); + winrt::IInspectable MenuItemsSource(); + void SelectsOnInvoked(bool value); bool SelectsOnInvoked(); static winrt::DependencyProperty CompactPaneLengthProperty() { return s_CompactPaneLengthProperty; } + static winrt::DependencyProperty HasUnrealizedChildrenProperty() { return s_HasUnrealizedChildrenProperty; } static winrt::DependencyProperty IconProperty() { return s_IconProperty; } + static winrt::DependencyProperty IsChildSelectedProperty() { return s_IsChildSelectedProperty; } + static winrt::DependencyProperty IsExpandedProperty() { return s_IsExpandedProperty; } + static winrt::DependencyProperty MenuItemsProperty() { return s_MenuItemsProperty; } + static winrt::DependencyProperty MenuItemsSourceProperty() { return s_MenuItemsSourceProperty; } static winrt::DependencyProperty SelectsOnInvokedProperty() { return s_SelectsOnInvokedProperty; } static GlobalDependencyProperty s_CompactPaneLengthProperty; + static GlobalDependencyProperty s_HasUnrealizedChildrenProperty; static GlobalDependencyProperty s_IconProperty; + static GlobalDependencyProperty s_IsChildSelectedProperty; + static GlobalDependencyProperty s_IsExpandedProperty; + static GlobalDependencyProperty s_MenuItemsProperty; + static GlobalDependencyProperty s_MenuItemsSourceProperty; static GlobalDependencyProperty s_SelectsOnInvokedProperty; static void EnsureProperties(); static void ClearProperties(); + static void OnHasUnrealizedChildrenPropertyChanged( + winrt::DependencyObject const& sender, + winrt::DependencyPropertyChangedEventArgs const& args); + static void OnIconPropertyChanged( winrt::DependencyObject const& sender, winrt::DependencyPropertyChangedEventArgs const& args); + + static void OnMenuItemsPropertyChanged( + winrt::DependencyObject const& sender, + winrt::DependencyPropertyChangedEventArgs const& args); + + static void OnMenuItemsSourcePropertyChanged( + winrt::DependencyObject const& sender, + winrt::DependencyPropertyChangedEventArgs const& args); }; diff --git a/dev/Generated/NavigationViewItemBase.properties.cpp b/dev/Generated/NavigationViewItemBase.properties.cpp index 1343395b2a..d49c742af0 100644 --- a/dev/Generated/NavigationViewItemBase.properties.cpp +++ b/dev/Generated/NavigationViewItemBase.properties.cpp @@ -8,9 +8,44 @@ namespace winrt::Microsoft::UI::Xaml::Controls { - CppWinRTActivatableClassWithBasicFactory(NavigationViewItemBase) + CppWinRTActivatableClassWithDPFactory(NavigationViewItemBase) } #include "NavigationViewItemBase.g.cpp" +GlobalDependencyProperty NavigationViewItemBaseProperties::s_IsSelectedProperty{ nullptr }; +NavigationViewItemBaseProperties::NavigationViewItemBaseProperties() +{ + EnsureProperties(); +} + +void NavigationViewItemBaseProperties::EnsureProperties() +{ + if (!s_IsSelectedProperty) + { + s_IsSelectedProperty = + InitializeDependencyProperty( + L"IsSelected", + winrt::name_of(), + winrt::name_of(), + false /* isAttached */, + ValueHelper::BoxedDefaultValue(), + nullptr); + } +} + +void NavigationViewItemBaseProperties::ClearProperties() +{ + s_IsSelectedProperty = nullptr; +} + +void NavigationViewItemBaseProperties::IsSelected(bool value) +{ + static_cast(this)->SetValue(s_IsSelectedProperty, ValueHelper::BoxValueIfNecessary(value)); +} + +bool NavigationViewItemBaseProperties::IsSelected() +{ + return ValueHelper::CastOrUnbox(static_cast(this)->GetValue(s_IsSelectedProperty)); +} diff --git a/dev/Generated/NavigationViewItemBase.properties.h b/dev/Generated/NavigationViewItemBase.properties.h new file mode 100644 index 0000000000..bb70b955b4 --- /dev/null +++ b/dev/Generated/NavigationViewItemBase.properties.h @@ -0,0 +1,21 @@ +// 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 NavigationViewItemBaseProperties +{ +public: + NavigationViewItemBaseProperties(); + + void IsSelected(bool value); + bool IsSelected(); + + static winrt::DependencyProperty IsSelectedProperty() { return s_IsSelectedProperty; } + + static GlobalDependencyProperty s_IsSelectedProperty; + + static void EnsureProperties(); + static void ClearProperties(); +}; diff --git a/dev/NavigationView/NavigationView.cpp b/dev/NavigationView/NavigationView.cpp index 8c77f06e20..eae4d4b70f 100644 --- a/dev/NavigationView/NavigationView.cpp +++ b/dev/NavigationView/NavigationView.cpp @@ -23,6 +23,12 @@ #include "InspectingDataSource.h" #include "NavigationViewAutomationPeer.h" #include "StackLayout.h" +#include "ItemsRepeater.h" +#include "ElementFactoryGetArgs.h" +#include "ElementFactoryRecycleArgs.h" +#include +#include "NavigationViewExpandingEventArgs.h" +#include "NavigationViewCollapsedEventArgs.h" static constexpr auto c_togglePaneButtonName = L"TogglePaneButton"sv; static constexpr auto c_paneTitleHolderFrameworkElement = L"PaneTitleHolder"sv; @@ -44,6 +50,7 @@ static constexpr auto c_navViewBackButtonToolTip = L"NavigationViewBackButtonToo static constexpr auto c_navViewCloseButton = L"NavigationViewCloseButton"sv; static constexpr auto c_navViewCloseButtonToolTip = L"NavigationViewCloseButtonToolTip"sv; static constexpr auto c_paneShadowReceiverCanvas = L"PaneShadowReceiver"sv; +static constexpr auto c_flyoutRootGrid = L"FlyoutRootGrid"sv; static constexpr auto c_topNavMenuItemsHost = L"TopNavMenuItemsHost"sv; static constexpr auto c_topNavOverflowButton = L"TopNavOverflowButton"sv; @@ -163,6 +170,7 @@ NavigationView::NavigationView() m_selectionModel.SingleSelect(true); m_selectionChangedRevoker = m_selectionModel.SelectionChanged(winrt::auto_revoke, { this, &NavigationView::OnSelectionModelSelectionChanged }); + m_childrenRequestedRevoker = m_selectionModel.ChildrenRequested(winrt::auto_revoke, { this, &NavigationView::OnSelectionModelChildrenRequested }); m_navigationViewItemsFactory = winrt::make_self(); @@ -175,6 +183,18 @@ NavigationView::NavigationView() nullptr /* defaultValue */); } +void NavigationView::OnSelectionModelChildrenRequested(const winrt::SelectionModel& selectionModel, const winrt::SelectionModelChildrenRequestedEventArgs& e) +{ + if (auto nvi = e.Source().try_as()) + { + e.Children(GetChildren(nvi)); + } + else if (auto const children = GetChildrenForItemInIndexPath(e.SourceIndex(), true /*forceRealize*/)) + { + e.Children(children); + } +} + void NavigationView::OnSelectionModelSelectionChanged(const winrt::SelectionModel& selectionModel, const winrt::SelectionModelSelectionChangedEventArgs& e) { auto selectedItem = selectionModel.SelectedItem(); @@ -191,38 +211,113 @@ void NavigationView::OnSelectionModelSelectionChanged(const winrt::SelectionMode return; } + bool setSelectedItem = true; + auto const selectedIndex = selectionModel.SelectedIndex(); if (IsTopNavigationView()) { - auto selectedIndex = selectionModel.SelectedIndex(); // If selectedIndex does not exist, means item is being deselected through API auto isInOverflow = (selectedIndex && selectedIndex.GetSize() > 0) ? !m_topDataProvider.IsItemInPrimaryList(selectedIndex.GetAt(0)) : false; if (isInOverflow) { - // SelectOverflowItem is moving data in/out of overflow. - auto scopeGuard = gsl::finally([this]() + // We only want to close the overflow flyout and move the item on selection if it is a leaf node + auto const itemShouldBeMoved = [selectedIndex, this]() + { + if (auto const selectedContainer = GetContainerForIndexPath(selectedIndex)) { - m_selectionChangeFromOverflowMenu = false; - }); - m_selectionChangeFromOverflowMenu = true; - - CloseTopNavigationViewFlyout(); + if (auto const selectedNVI = selectedContainer.try_as()) + { + if (DoesNavigationViewItemHaveChildren(selectedNVI)) + { + return false; + } + } + } + return true; + }(); - if (!IsSelectionSuppressed(selectedItem)) + if (itemShouldBeMoved) { - SelectOverflowItem(selectedItem); + SelectandMoveOverflowItem(selectedItem, selectedIndex, true /*closeFlyout*/); + setSelectedItem = false; } - } - else - { - SetSelectedItemAndExpectItemInvokeWhenSelectionChangedIfNotInvokedFromAPI(selectedItem); - } + else + { + m_moveTopNavOverflowItemOnFlyoutClose = true; + } + } } - else + + if (setSelectedItem) { SetSelectedItemAndExpectItemInvokeWhenSelectionChangedIfNotInvokedFromAPI(selectedItem); } } +void NavigationView::SelectandMoveOverflowItem(winrt::IInspectable const& selectedItem, winrt::IndexPath const& selectedIndex, bool closeFlyout) +{ + // SelectOverflowItem is moving data in/out of overflow. + auto scopeGuard = gsl::finally([this]() + { + m_selectionChangeFromOverflowMenu = false; + }); + m_selectionChangeFromOverflowMenu = true; + + if (closeFlyout) + { + CloseTopNavigationViewFlyout(); + } + + if (!IsSelectionSuppressed(selectedItem)) + { + SelectOverflowItem(selectedItem, selectedIndex); + } +} + +// We only need to close the flyout if the selected item is a leaf node +void NavigationView::CloseFlyoutIfRequired() +{ + bool isInModeWithFlyout = [this]() + { + if (auto splitView = m_rootSplitView.get()) + { + // Check if the pane is closed and if the splitview is in either compact mode. + auto splitViewDisplayMode = splitView.DisplayMode(); + return (!splitView.IsPaneOpen() && (splitViewDisplayMode == winrt::SplitViewDisplayMode::CompactOverlay || splitViewDisplayMode == winrt::SplitViewDisplayMode::CompactInline)) || + PaneDisplayMode() == winrt::NavigationViewPaneDisplayMode::Top; + } + return false; + }(); + + if (isInModeWithFlyout) + { + if (auto const selectedIndex = m_selectionModel.SelectedIndex()) + { + if (auto const selectedItem = GetContainerForIndexPath(selectedIndex)) + { + if (auto const selectedNVI = selectedItem.try_as()) + { + if (!DoesNavigationViewItemHaveChildren(selectedNVI)) + { + // Item selected is a leaf node, find top level parent and close flyout + if (auto const rootItem = GetContainerForIndex(selectedIndex.GetAt(0))) + { + if (auto const nvi = rootItem.try_as()) + { + auto const nviImpl = winrt::get_self(nvi); + if (nviImpl->ShouldRepeaterShowInFlyout()) + { + nviImpl->ShowChildren(false); + } + } + } + } + } + + } + } + } +} + void NavigationView::OnApplyTemplate() { // Stop update anything because of PropertyChange during OnApplyTemplate. Update them all together at the end of this function @@ -237,7 +332,7 @@ void NavigationView::OnApplyTemplate() { m_paneToggleButton.set(paneToggleButton); m_paneToggleButtonClickRevoker = paneToggleButton.Click(winrt::auto_revoke, { this, &NavigationView::OnPaneToggleButtonClick }); - + SetPaneToggleButtonAutomationName(); if (SharedHelpers::IsRS3OrHigher()) @@ -262,11 +357,11 @@ void NavigationView::OnApplyTemplate() { m_rootSplitView.set(splitView); m_splitViewIsPaneOpenChangedRevoker = RegisterPropertyChanged(splitView, - winrt::SplitView::IsPaneOpenProperty(), + winrt::SplitView::IsPaneOpenProperty(), { this, &NavigationView::OnSplitViewClosedCompactChanged }); m_splitViewDisplayModeChangedRevoker = RegisterPropertyChanged(splitView, - winrt::SplitView::DisplayModeProperty(), + winrt::SplitView::DisplayModeProperty(), { this, &NavigationView::OnSplitViewClosedCompactChanged }); if (SharedHelpers::IsRS3OrHigher()) // These events are new to RS3/v5 API @@ -287,10 +382,18 @@ void NavigationView::OnApplyTemplate() { m_leftNavRepeater.set(leftNavRepeater); - m_leftNavItemsRepeaterElementPreparedRevoker = leftNavRepeater.ElementPrepared(winrt::auto_revoke, { this, &NavigationView::RepeaterElementPrepared }); - m_leftNavItemsRepeaterElementClearingRevoker = leftNavRepeater.ElementClearing(winrt::auto_revoke, { this, &NavigationView::RepeaterElementClearing }); - m_leftNavRepeaterGettingFocusRevoker = leftNavRepeater.GettingFocus(winrt::auto_revoke, { this, &NavigationView::RepeaterGettingFocus }); - + // API is currently in preview, so setting this via code. + // Disabling virtualization for now because of https://github.com/microsoft/microsoft-ui-xaml/issues/2095 + if (auto stackLayout = leftNavRepeater.Layout().try_as()) + { + auto stackLayoutImpl = winrt::get_self(stackLayout); + stackLayoutImpl->DisableVirtualization(true); + } + + m_leftNavItemsRepeaterElementPreparedRevoker = leftNavRepeater.ElementPrepared(winrt::auto_revoke, { this, &NavigationView::OnRepeaterElementPrepared }); + m_leftNavItemsRepeaterElementClearingRevoker = leftNavRepeater.ElementClearing(winrt::auto_revoke, { this, &NavigationView::OnRepeaterElementClearing }); + m_leftNavRepeaterGettingFocusRevoker = leftNavRepeater.GettingFocus(winrt::auto_revoke, { this, &NavigationView::OnRepeaterGettingFocus }); + m_leftNavRepeaterLoadedRevoker = leftNavRepeater.Loaded(winrt::auto_revoke, { this, &NavigationView::OnRepeaterLoaded }); leftNavRepeater.ItemTemplate(*m_navigationViewItemsFactory); @@ -308,9 +411,9 @@ void NavigationView::OnApplyTemplate() stackLayoutImpl->DisableVirtualization(true); } - m_topNavItemsRepeaterElementPreparedRevoker = topNavRepeater.ElementPrepared(winrt::auto_revoke, { this, &NavigationView::RepeaterElementPrepared }); - m_topNavItemsRepeaterElementClearingRevoker = topNavRepeater.ElementClearing(winrt::auto_revoke, { this, &NavigationView::RepeaterElementClearing }); - m_topNavRepeaterGettingFocusRevoker = topNavRepeater.GettingFocus(winrt::auto_revoke, { this, &NavigationView::RepeaterGettingFocus }); + m_topNavItemsRepeaterElementPreparedRevoker = topNavRepeater.ElementPrepared(winrt::auto_revoke, { this, &NavigationView::OnRepeaterElementPrepared }); + m_topNavItemsRepeaterElementClearingRevoker = topNavRepeater.ElementClearing(winrt::auto_revoke, { this, &NavigationView::OnRepeaterElementClearing }); + m_topNavRepeaterGettingFocusRevoker = topNavRepeater.GettingFocus(winrt::auto_revoke, { this, &NavigationView::OnRepeaterGettingFocus }); m_topNavRepeaterLoadedRevoker = topNavRepeater.Loaded(winrt::auto_revoke, { this, &NavigationView::OnRepeaterLoaded }); @@ -322,8 +425,16 @@ void NavigationView::OnApplyTemplate() { m_topNavRepeaterOverflowView.set(topNavListOverflowRepeater); - m_topNavOverflowItemsRepeaterElementPreparedRevoker = topNavListOverflowRepeater.ElementPrepared(winrt::auto_revoke, { this, &NavigationView::RepeaterElementPrepared }); - m_topNavOverflowItemsRepeaterElementClearingRevoker = topNavListOverflowRepeater.ElementClearing(winrt::auto_revoke, { this, &NavigationView::RepeaterElementClearing }); + // API is currently in preview, so setting this via code. + // Disabling virtualization for now because of https://github.com/microsoft/microsoft-ui-xaml/issues/2095 + if (auto stackLayout = topNavListOverflowRepeater.Layout().try_as()) + { + auto stackLayoutImpl = winrt::get_self(stackLayout); + stackLayoutImpl->DisableVirtualization(true); + } + + m_topNavOverflowItemsRepeaterElementPreparedRevoker = topNavListOverflowRepeater.ElementPrepared(winrt::auto_revoke, { this, &NavigationView::OnRepeaterElementPrepared }); + m_topNavOverflowItemsRepeaterElementClearingRevoker = topNavListOverflowRepeater.ElementClearing(winrt::auto_revoke, { this, &NavigationView::OnRepeaterElementClearing }); topNavListOverflowRepeater.ItemTemplate(*m_navigationViewItemsFactory); } @@ -336,9 +447,13 @@ void NavigationView::OnApplyTemplate() auto visual = winrt::ElementCompositionPreview::GetElementVisual(topNavOverflowButton); CreateAndAttachHeaderAnimation(visual); - if (winrt::IFlyoutBase6 topNavOverflowButtonAsFlyoutBase6 = topNavOverflowButton.Flyout()) + if (auto const flyoutBase = topNavOverflowButton.Flyout()) { - topNavOverflowButtonAsFlyoutBase6.ShouldConstrainToRootBounds(false); + if (winrt::IFlyoutBase6 topNavOverflowButtonAsFlyoutBase6 = flyoutBase) + { + topNavOverflowButtonAsFlyoutBase6.ShouldConstrainToRootBounds(false); + } + m_flyoutClosingRevoker = flyoutBase.Closing(winrt::auto_revoke, { this, &NavigationView::OnFlyoutClosing }); } } @@ -380,7 +495,7 @@ void NavigationView::OnApplyTemplate() { m_backButton.set(backButton); m_backButtonClickedRevoker = backButton.Click(winrt::auto_revoke, { this, &NavigationView::OnBackButtonClicked }); - + winrt::hstring navigationName = ResourceAccessor::GetLocalizedStringResource(SR_NavigationBackButtonName); winrt::AutomationProperties::SetName(backButton, navigationName); } @@ -443,7 +558,7 @@ void NavigationView::OnApplyTemplate() m_appliedTemplate = true; // Do initial setup - UpdatePaneDisplayMode(); + UpdatePaneDisplayMode(); UpdateHeaderVisibility(); UpdatePaneTitleFrameworkElementParents(); UpdateTitleBarPadding(); @@ -522,31 +637,77 @@ void NavigationView::UpdateItemsRepeaterItemsSource(const winrt::ItemsRepeater& } } +void NavigationView::OnFlyoutClosing(const winrt::IInspectable& sender, const winrt::FlyoutBaseClosingEventArgs& args) +{ + // If the user selected an parent item in the overflow flyout then the item has not been moved to top primary yet. + // So we need to move it. + if (m_moveTopNavOverflowItemOnFlyoutClose && !m_selectionChangeFromOverflowMenu) + { + m_moveTopNavOverflowItemOnFlyoutClose = false; + + auto const selectedIndex = m_selectionModel.SelectedIndex(); + if (selectedIndex.GetSize() > 0) + { + if (auto const firstContainer = GetContainerForIndex(selectedIndex.GetAt(0))) + { + if (auto const firstNVI = firstContainer.try_as()) + { + // We want to collapse the top level item before we move it + firstNVI.IsExpanded(false); + } + } + + SelectandMoveOverflowItem(SelectedItem(), selectedIndex, false); + } + } +} + void NavigationView::OnNavigationViewItemIsSelectedPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args) { - if (auto const nvib = sender.try_as()) + if (auto const nvi = sender.try_as()) { // Check whether the container that triggered this call back is the selected container - bool isContainerSelectedInModel = IsContainerTheSelectedItemInTheSelectionModel(nvib); - bool isSelectedInContainer = nvib.IsSelected(); + bool isContainerSelectedInModel = IsContainerTheSelectedItemInTheSelectionModel(nvi); + bool isSelectedInContainer = nvi.IsSelected(); if (isSelectedInContainer && !isContainerSelectedInModel) { - auto indexPath = GetIndexPathForContainer(nvib); - m_selectionModel.SelectAt(indexPath); + auto indexPath = GetIndexPathForContainer(nvi); + UpdateSelectionModelSelection(indexPath); } else if (!isSelectedInContainer && isContainerSelectedInModel) { - auto indexPath = GetIndexPathForContainer(nvib); + auto indexPath = GetIndexPathForContainer(nvi); auto indexPathFromModel = m_selectionModel.SelectedIndex(); - if (indexPathFromModel && - indexPath.GetSize() > 0 && indexPathFromModel.GetSize() > 0 && - indexPath.GetAt(0) == indexPathFromModel.GetAt(0)) + if (indexPathFromModel && indexPath.CompareTo(indexPathFromModel) == 0) { m_selectionModel.DeselectAt(indexPath); } } + + if (isSelectedInContainer) + { + nvi.IsChildSelected(false); + } + } +} + +void NavigationView::OnNavigationViewItemExpandedPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args) +{ + if (auto const nvi = sender.try_as()) + { + if (nvi.IsExpanded()) + { + RaiseExpandingEvent(nvi); + } + + ShowHideChildrenItemsRepeater(nvi); + + if (!nvi.IsExpanded()) + { + RaiseCollapsedEvent(nvi); + } } } @@ -596,13 +757,20 @@ void NavigationView::OnNavigationViewItemInvoked(const winrt::NavigationViewItem return; } - if (m_selectionModel && nvi.SelectsOnInvoked()) + bool updateSelection = m_selectionModel && nvi.SelectsOnInvoked(); + if (updateSelection) { auto ip = GetIndexPathForContainer(nvi); - m_selectionModel.SelectAt(ip); + UpdateSelectionModelSelection(ip); } - ClosePaneIfNeccessaryAfterItemIsClicked(); + ToggleIsExpandedNavigationViewItem(nvi); + ClosePaneIfNeccessaryAfterItemIsClicked(nvi); + + if (updateSelection) + { + CloseFlyoutIfRequired(); + } } bool NavigationView::IsRootItemsRepeater(const winrt::DependencyObject& element) @@ -616,6 +784,15 @@ bool NavigationView::IsRootItemsRepeater(const winrt::DependencyObject& element) return false; } +bool NavigationView::IsRootGridOfFlyout(const winrt::DependencyObject& element) +{ + if (auto grid = element.try_as()) + { + return grid.Name() == c_flyoutRootGrid; + } + return false; +} + winrt::ItemsRepeater NavigationView::GetParentItemsRepeaterForContainer(const winrt::NavigationViewItemBase& nvib) { if (auto parent = winrt::VisualTreeHelper::GetParent(nvib)) @@ -628,6 +805,25 @@ winrt::ItemsRepeater NavigationView::GetParentItemsRepeaterForContainer(const wi return nullptr; } +winrt::NavigationViewItem NavigationView::GetParentNavigationViewItemForContainer(const winrt::NavigationViewItemBase& nvib) +{ + // TODO: This scenario does not find parent items when in a flyout, which causes problems if item if first loaded + // straight in the flyout. Fix. This logic can be merged with the 'GetIndexPathForContainer' logic below. + winrt::DependencyObject parent = GetParentItemsRepeaterForContainer(nvib); + if (!IsRootItemsRepeater(parent)) + { + while (parent) + { + parent = winrt::VisualTreeHelper::GetParent(parent); + if (auto const nvi = parent.try_as()) + { + return nvi; + } + } + } + return nullptr; +} + winrt::IndexPath NavigationView::GetIndexPathForContainer(const winrt::NavigationViewItemBase& nvib) { auto path = std::vector(); @@ -640,7 +836,7 @@ winrt::IndexPath NavigationView::GetIndexPathForContainer(const winrt::Navigatio } // Search through VisualTree for a root itemsrepeater - while (parent && !IsRootItemsRepeater(parent)) + while (parent && !IsRootItemsRepeater(parent) && !IsRootGridOfFlyout(parent)) { if (auto parentIR = parent.try_as()) { @@ -653,6 +849,16 @@ winrt::IndexPath NavigationView::GetIndexPathForContainer(const winrt::Navigatio parent = winrt::VisualTreeHelper::GetParent(parent); } + // If the item is in a flyout, then we need to final index of its parent + if (IsRootGridOfFlyout(parent)) + { + if (auto const nvi = m_lastItemExpandedIntoFlyout.get()) + { + child = nvi; + parent = IsTopNavigationView() ? m_topNavRepeater.get() : m_leftNavRepeater.get(); + } + } + // If item is in one of the disconnected ItemRepeaters, account for that in IndexPath calculations if (parent == m_topNavRepeaterOverflowView.get()) { @@ -678,8 +884,7 @@ winrt::IndexPath NavigationView::GetIndexPathForContainer(const winrt::Navigatio return IndexPath::CreateFromIndices(path); } - -void NavigationView::RepeaterElementPrepared(const winrt::ItemsRepeater& ir, const winrt::ItemsRepeaterElementPreparedEventArgs& args) +void NavigationView::OnRepeaterElementPrepared(const winrt::ItemsRepeater& ir, const winrt::ItemsRepeaterElementPreparedEventArgs& args) { // This validation is only relevant outside of the Windows build where WUXC and MUXC have distinct types. // Certain items are disallowed in a NavigationView's items list. Check for them. @@ -692,11 +897,12 @@ void NavigationView::RepeaterElementPrepared(const winrt::ItemsRepeater& ir, con { auto nvibImpl = winrt::get_self(nvib); nvibImpl->SetNavigationViewParent(*this); + nvibImpl->IsTopLevelItem(IsTopLevelItem(nvib)); // Visual state info propagation auto position = [this, ir]() { - if(IsTopNavigationView()) + if (IsTopNavigationView()) { if (ir == m_topNavRepeater.get()) { @@ -708,11 +914,34 @@ void NavigationView::RepeaterElementPrepared(const winrt::ItemsRepeater& ir, con }(); nvibImpl->Position(position); + if (auto const parentNVI = GetParentNavigationViewItemForContainer(nvib)) + { + auto const parentNVIImpl = winrt::get_self(parentNVI); + auto itemDepth = parentNVIImpl->ShouldRepeaterShowInFlyout() ? 0 : parentNVIImpl->Depth() + 1; + nvibImpl->Depth(itemDepth); + } + else + { + nvibImpl->Depth(0); + } + // Apply any custom container styling ApplyCustomMenuItemContainerStyling(nvib, ir, args.Index()); if (auto nvi = args.Element().try_as()) { + // Propagate depth to children items if they exist + auto childDepth = [position, nvibImpl]() + { + if (position == NavigationViewRepeaterPosition::TopPrimary) + { + return 0; + } + return nvibImpl->Depth() + 1; + + }(); + winrt::get_self(nvi)->PropagateDepthToChildren(childDepth); + if (ir != m_topNavRepeaterOverflowView.get()) { nvibImpl->UseSystemFocusVisuals(ShouldShowFocusVisual()); @@ -724,7 +953,8 @@ void NavigationView::RepeaterElementPrepared(const winrt::ItemsRepeater& ir, con nviRevokers->keyDownRevoker = nvi.KeyDown(winrt::auto_revoke, { this, &NavigationView::OnNavigationViewItemKeyDown }); nviRevokers->keyUpRevoker = nvi.KeyUp(winrt::auto_revoke, { this, &NavigationView::OnNavigationViewItemKeyUp }); nviRevokers->gotFocusRevoker = nvi.GotFocus(winrt::auto_revoke, { this, &NavigationView::OnNavigationViewItemOnGotFocus }); - nviRevokers->isSelectedRevoker = RegisterPropertyChanged(nvi, winrt::SelectorItem::IsSelectedProperty(), { this, &NavigationView::OnNavigationViewItemIsSelectedPropertyChanged }); + nviRevokers->isSelectedRevoker = RegisterPropertyChanged(nvi, winrt::NavigationViewItemBase::IsSelectedProperty(), { this, &NavigationView::OnNavigationViewItemIsSelectedPropertyChanged }); + nviRevokers->isExpandedRevoker = RegisterPropertyChanged(nvi, winrt::NavigationViewItem::IsExpandedProperty(), { this, &NavigationView::OnNavigationViewItemExpandedPropertyChanged }); nvi.SetValue(s_NavigationViewItemRevokersProperty, nviRevokers.as()); } } @@ -751,13 +981,18 @@ void NavigationView::ApplyCustomMenuItemContainerStyling(const winrt::Navigation } } -void NavigationView::RepeaterElementClearing(const winrt::ItemsRepeater& ir, const winrt::ItemsRepeaterElementClearingEventArgs& args) +void NavigationView::OnRepeaterElementClearing(const winrt::ItemsRepeater& ir, const winrt::ItemsRepeaterElementClearingEventArgs& args) { - if (auto nvi = args.Element().try_as()) + if (auto nvib = args.Element().try_as()) { - auto nviImpl = winrt::get_self(nvi); - // Revoke all the events that we were listing to on the item - nvi.SetValue(s_NavigationViewItemRevokersProperty, nullptr); + auto const nvibImpl = winrt::get_self(nvib); + nvibImpl->Depth(0); + nvibImpl->IsTopLevelItem(false); + if (auto nvi = nvib.try_as()) + { + // Revoke all the events that we were listing to on the item + nvi.SetValue(s_NavigationViewItemRevokersProperty, nullptr); + } } } @@ -767,7 +1002,7 @@ void NavigationView::CreateAndHookEventsToSettings(std::wstring_view settingsNam winrt::IControlProtected controlProtected = *this; auto settingsItem = GetTemplateChildT(settingsName, controlProtected); if (settingsItem && settingsItem != m_settingsItem.get()) - { + { // If the old settings item is selected, move the selection to the new one. auto selectedItem = SelectedItem(); bool shouldSelectSetting = selectedItem && IsSettingsItem(selectedItem); @@ -859,11 +1094,8 @@ void NavigationView::OnLayoutUpdated(const winrt::IInspectable& sender, const wi // And it depends on LayoutUpdated to re-play the animation. m_lastSelectedItemPendingAnimationInTopNav is the last selected overflow item. if (auto lastSelectedItemInTopNav = m_lastSelectedItemPendingAnimationInTopNav.get()) { - AnimateSelectionChanged(lastSelectedItemInTopNav, SelectedItem()); - } - else - { - AnimateSelectionChanged(nullptr, SelectedItem()); + m_lastSelectedItemPendingAnimationInTopNav.set(nullptr); + AnimateSelectionChanged(lastSelectedItemInTopNav); } } @@ -985,9 +1217,9 @@ void NavigationView::OnPaneTitleHolderSizeChanged(const winrt::IInspectable& /*s void NavigationView::OpenPane() { auto scopeGuard = gsl::finally([this]() - { - m_isOpenPaneForInteraction = false; - }); + { + m_isOpenPaneForInteraction = false; + }); m_isOpenPaneForInteraction = true; IsPaneOpen(true); } @@ -995,10 +1227,11 @@ void NavigationView::OpenPane() // Call this when you want an uncancellable close void NavigationView::ClosePane() { + CollapseAllMenuItemsUnderRepeater(m_leftNavRepeater.get()); auto scopeGuard = gsl::finally([this]() - { - m_isOpenPaneForInteraction = false; - }); + { + m_isOpenPaneForInteraction = false; + }); m_isOpenPaneForInteraction = true; IsPaneOpen(false); // the SplitView is two-way bound to this value } @@ -1250,9 +1483,9 @@ void NavigationView::UpdatePaneTitleFrameworkElementParents() paneTitleHolderFrameworkElement.Visibility( (isPaneToggleButtonVisible || - isTopNavigationView || - PaneTitle().size() == 0 || - (PaneDisplayMode() == winrt::NavigationViewPaneDisplayMode::LeftMinimal && !IsPaneOpen())) ? + isTopNavigationView || + PaneTitle().size() == 0 || + (PaneDisplayMode() == winrt::NavigationViewPaneDisplayMode::LeftMinimal && !IsPaneOpen())) ? winrt::Visibility::Collapsed : winrt::Visibility::Visible); if (auto&& paneTitleFrameworkElement = m_paneTitleFrameworkElement.get()) @@ -1265,7 +1498,7 @@ void NavigationView::UpdatePaneTitleFrameworkElementParents() } } -std::function NavigationView::SetPaneTitleFrameworkElementParent(const winrt::ContentControl& parent, const winrt::FrameworkElement& paneTitle, bool shouldNotContainPaneTitle) +std::function NavigationView::SetPaneTitleFrameworkElementParent(const winrt::ContentControl& parent, const winrt::FrameworkElement& paneTitle, bool shouldNotContainPaneTitle) { if (parent) { @@ -1293,15 +1526,21 @@ void NavigationView::AnimateSelectionChangedToItem(const winrt::IInspectable& se { if (selectedItem && !IsSelectionSuppressed(selectedItem)) { - AnimateSelectionChanged(nullptr /* prevItem */, selectedItem); + AnimateSelectionChanged(selectedItem); } } // Please clear the field m_lastSelectedItemPendingAnimationInTopNav when calling this method to prevent garbage value and incorrect animation // when the layout is invalidated as it's called in OnLayoutUpdated. -void NavigationView::AnimateSelectionChanged(const winrt::IInspectable& prevItem, const winrt::IInspectable& nextItem) -{ - winrt::UIElement prevIndicator = FindSelectionIndicator(prevItem); +void NavigationView::AnimateSelectionChanged(const winrt::IInspectable& nextItem) +{ + // If we are delaying animation due to item movement in top nav overflow, dont do anything + if (m_lastSelectedItemPendingAnimationInTopNav) + { + return; + } + + winrt::UIElement prevIndicator = m_activeIndicator.get(); winrt::UIElement nextIndicator = FindSelectionIndicator(nextItem); bool haveValidAnimation = false; @@ -1317,7 +1556,7 @@ void NavigationView::AnimateSelectionChanged(const winrt::IInspectable& prevItem ResetElementAnimationProperties(prevIndicator, 0.0f); } haveValidAnimation = true; - } + } else { // If the last animation is still playing, force it to complete. @@ -1329,7 +1568,7 @@ void NavigationView::AnimateSelectionChanged(const winrt::IInspectable& prevItem { winrt::UIElement paneContentGrid = m_paneContentGrid.get(); - if ((prevItem != nextItem) && paneContentGrid && prevIndicator && nextIndicator && SharedHelpers::IsAnimationsEnabled()) + if ((prevIndicator != nextIndicator) && paneContentGrid && prevIndicator && nextIndicator && SharedHelpers::IsAnimationsEnabled()) { // Make sure both indicators are visible and in their original locations ResetElementAnimationProperties(prevIndicator, 1.0f); @@ -1345,23 +1584,55 @@ void NavigationView::AnimateSelectionChanged(const winrt::IInspectable& prevItem winrt::Size prevSize = prevIndicator.RenderSize(); winrt::Size nextSize = nextIndicator.RenderSize(); + bool areElementsAtSameDepth = false; if (IsTopNavigationView()) { prevPos = prevPosPoint.X; nextPos = nextPosPoint.X; + areElementsAtSameDepth = prevPosPoint.Y == nextPosPoint.Y; } else { prevPos = prevPosPoint.Y; nextPos = nextPosPoint.Y; + areElementsAtSameDepth = prevPosPoint.X == nextPosPoint.X; } winrt::Visual visual = winrt::ElementCompositionPreview::GetElementVisual(*this); winrt::CompositionScopedBatch scopedBatch = visual.Compositor().CreateScopedBatch(winrt::CompositionBatchTypes::Animation); - // Play the animation on both the previous and next indicators - PlayIndicatorAnimations(prevIndicator, 0, nextPos - prevPos, prevSize, nextSize, true); - PlayIndicatorAnimations(nextIndicator, prevPos - nextPos, 0, prevSize, nextSize, false); + if (!areElementsAtSameDepth) + { + bool isNextBelow = prevPosPoint.Y < nextPosPoint.Y; + prevIndicator.RenderSize().Height > prevIndicator.RenderSize().Width ? + PlayIndicatorNonSameLevelAnimations(prevIndicator, true, isNextBelow ? false : true) : + PlayIndicatorNonSameLevelTopPrimaryAnimation(prevIndicator, true); + + nextIndicator.RenderSize().Height > nextIndicator.RenderSize().Width ? + PlayIndicatorNonSameLevelAnimations(nextIndicator, false, isNextBelow ? true : false) : + PlayIndicatorNonSameLevelTopPrimaryAnimation(nextIndicator, false); + + } + else + { + + float outgoingEndPosition = static_cast(nextPos - prevPos); + float incomingStartPosition = static_cast(prevPos - nextPos); + + // Play the animation on both the previous and next indicators + PlayIndicatorAnimations(prevIndicator, + 0, + outgoingEndPosition, + prevSize, + nextSize, + true); + PlayIndicatorAnimations(nextIndicator, + incomingStartPosition, + 0, + prevSize, + nextSize, + false); + } scopedBatch.End(); m_prevIndicator.set(prevIndicator); @@ -1370,9 +1641,9 @@ void NavigationView::AnimateSelectionChanged(const winrt::IInspectable& prevItem auto strongThis = get_strong(); scopedBatch.Completed( [strongThis](auto sender, auto args) - { - strongThis->OnAnimationComplete(sender, args); - }); + { + strongThis->OnAnimationComplete(sender, args); + }); } else { @@ -1381,19 +1652,58 @@ void NavigationView::AnimateSelectionChanged(const winrt::IInspectable& prevItem ResetElementAnimationProperties(nextIndicator, 1.0f); } - if (m_lastSelectedItemPendingAnimationInTopNav.get()) - { - // if nextItem && !nextIndicator, that means a item from topnav flyout is selected, and we delay the animation to LayoutUpdated. - // nextIndicator is null because we have problem to get the selectionindicator since it's not in primary list yet. - // Otherwise we already done the animation and clear m_lastSelectedItemPendingAnimationInTopNav. - if (!(nextItem && !nextIndicator)) - { - m_lastSelectedItemPendingAnimationInTopNav.set(nullptr); - } - } + m_activeIndicator.set(nextIndicator); } } +void NavigationView::PlayIndicatorNonSameLevelAnimations(const winrt::UIElement& indicator, bool isOutgoing, bool fromTop) +{ + winrt::Visual visual = winrt::ElementCompositionPreview::GetElementVisual(indicator); + winrt::Compositor comp = visual.Compositor(); + + // Determine scaling of indicator (whether it is appearing or dissapearing) + float beginScale = isOutgoing ? 1.0f : 0.0f; + float endScale = isOutgoing ? 0.0f : 1.0f; + winrt::ScalarKeyFrameAnimation scaleAnim = comp.CreateScalarKeyFrameAnimation(); + scaleAnim.InsertKeyFrame(0.0f, beginScale); + scaleAnim.InsertKeyFrame(1.0f, endScale); + scaleAnim.Duration(600ms); + + // Determine where the indicator is animating from/to + winrt::Size size = indicator.RenderSize(); + float dimension = IsTopNavigationView() ? size.Width : size.Height; + float newCenter = fromTop ? 0.0f : dimension; + auto indicatorCenterPoint = visual.CenterPoint(); + indicatorCenterPoint.y = newCenter; + visual.CenterPoint(indicatorCenterPoint); + + visual.StartAnimation(L"Scale.Y", scaleAnim); +} + + +void NavigationView::PlayIndicatorNonSameLevelTopPrimaryAnimation(const winrt::UIElement& indicator, bool isOutgoing) +{ + winrt::Visual visual = winrt::ElementCompositionPreview::GetElementVisual(indicator); + winrt::Compositor comp = visual.Compositor(); + + // Determine scaling of indicator (whether it is appearing or dissapearing) + float beginScale = isOutgoing ? 1.0f : 0.0f; + float endScale = isOutgoing ? 0.0f : 1.0f; + winrt::ScalarKeyFrameAnimation scaleAnim = comp.CreateScalarKeyFrameAnimation(); + scaleAnim.InsertKeyFrame(0.0f, beginScale); + scaleAnim.InsertKeyFrame(1.0f, endScale); + scaleAnim.Duration(600ms); + + // Determine where the indicator is animating from/to + winrt::Size size = indicator.RenderSize(); + float newCenter = size.Width /2; + auto indicatorCenterPoint = visual.CenterPoint(); + indicatorCenterPoint.y = newCenter; + visual.CenterPoint(indicatorCenterPoint); + + visual.StartAnimation(L"Scale.X", scaleAnim); +} + void NavigationView::PlayIndicatorAnimations(const winrt::UIElement& indicator, float from, float to, winrt::Size beginSize, winrt::Size endSize, bool isOutgoing) { winrt::Visual visual = winrt::ElementCompositionPreview::GetElementVisual(indicator); @@ -1471,10 +1781,7 @@ void NavigationView::ResetElementAnimationProperties(const winrt::UIElement& ele if (element) { element.Opacity(desiredOpacity); - - winrt::Visual visual = winrt::ElementCompositionPreview::GetElementVisual(element); - - if (visual) + if (winrt::Visual visual = winrt::ElementCompositionPreview::GetElementVisual(element)) { visual.Offset(winrt::float3(0.0f, 0.0f, 0.0f)); visual.Scale(winrt::float3(1.0f, 1.0f, 1.0f)); @@ -1522,12 +1829,11 @@ winrt::UIElement NavigationView::FindSelectionIndicator(const winrt::IInspectabl { if (item) { - if (auto nvi = NavigationViewItemOrSettingsContentFromData(item)) + if (auto const container = NavigationViewItemOrSettingsContentFromData(item)) { - return winrt::get_self(nvi)->GetSelectionIndicator(); + return winrt::get_self(container)->GetSelectionIndicator(); } } - return nullptr; } @@ -1543,7 +1849,7 @@ void NavigationView::RaiseSelectionChangedEvent(winrt::IInspectable const& nextI eventArgs->RecommendedNavigationTransitionInfo(CreateNavigationTransitionInfo(recommendedDirection)); m_selectionChangedEventSource(*this, *eventArgs); } - + // SelectedItem change can be invoked by API or user's action like clicking. if it's not from API, m_shouldRaiseInvokeItemInSelectionChange would be true // If nextItem is selectionsuppressed, we should undo the selection. We didn't undo it OnSelectionChange because we want change by API has the same undo logic. void NavigationView::ChangeSelection(const winrt::IInspectable& prevItem, const winrt::IInspectable& nextItem) @@ -1557,14 +1863,13 @@ void NavigationView::ChangeSelection(const winrt::IInspectable& prevItem, const if (IsSelectionSuppressed(nextItem)) { + // This should not be a common codepath. Only happens if customer passes a 'selectionsuppressed' item via API. UndoSelectionAndRevertSelectionTo(prevItem, nextItem); - - // Undo only happened when customer clicked a selectionsuppressed item. - // To simplify the logic, OnItemClick didn't raise the event and it's been delayed to here. RaiseItemInvoked(nextItem, isSettingsItem); } else { + // TODO: The raising of this event can probably can be moved where the settings invocation is first handled. // Need to raise ItemInvoked for when the settings item gets invoked if (isSettingsItem) { @@ -1598,12 +1903,52 @@ void NavigationView::ChangeSelection(const winrt::IInspectable& prevItem, const // And SelectionChanged is after we selected the new item. UnselectPrevItem(prevItem, nextItem); ChangeSelectStatusForItem(nextItem, true /*selected*/); - RaiseSelectionChangedEvent(nextItem, isSettingsItem, recommendedDirection); + AnimateSelectionChanged(nextItem); + } +} + +void NavigationView::UpdateSelectionModelSelection(const winrt::IndexPath& ip) +{ + auto const prevIndexPath = m_selectionModel.SelectedIndex(); + m_selectionModel.SelectAt(ip); + UpdateIsChildSelected(prevIndexPath, ip); +} - AnimateSelectionChanged(prevItem, nextItem); +void NavigationView::UpdateIsChildSelected(const winrt::IndexPath& prevIP, const winrt::IndexPath& nextIP) +{ + if (prevIP && prevIP.GetSize() > 0) + { + UpdateIsChildSelectedForIndexPath(prevIP, false /*isChildSelected*/); + } + + if (nextIP && nextIP.GetSize() > 0) + { + UpdateIsChildSelectedForIndexPath(nextIP, true /*isChildSelected*/); + } +} - ClosePaneIfNeccessaryAfterItemIsClicked(); +void NavigationView::UpdateIsChildSelectedForIndexPath(const winrt::IndexPath& ip, bool isChildSelected) +{ + // Update the isChildSelected property for every container on the IndexPath (with the exception of the actual container pointed to by the indexpath) + auto container = GetContainerForIndex(ip.GetAt(0)); + auto index = 1; + while (container) + { + if (auto const nvi = container.try_as()) + { + nvi.IsChildSelected(isChildSelected); + if (auto const nextIR = winrt::get_self(nvi)->GetRepeater()) + { + if (index < ip.GetSize() - 1) + { + container = nextIR.TryGetElement(ip.GetAt(index)); + index++; + continue; + } + } + } + container = nullptr; } } @@ -1633,7 +1978,7 @@ void NavigationView::RaiseItemInvoked(winrt::IInspectable const& item, } } else - { + { MUX_ASSERT(item); invokedContainer = item.try_as(); MUX_ASSERT(invokedContainer); @@ -1771,6 +2116,7 @@ void NavigationView::OnNavigationViewItemTapped(const winrt::IInspectable& sende OnNavigationViewItemInvoked(nvi); } nvi.Focus(winrt::FocusState::Pointer); + args.Handled(true); } } @@ -1886,7 +2232,7 @@ void NavigationView::KeyboardFocusLastItemFromItem(const winrt::NavigationViewIt } } -void NavigationView::RepeaterGettingFocus(const winrt::IInspectable& sender, const winrt::GettingFocusEventArgs& args) +void NavigationView::OnRepeaterGettingFocus(const winrt::IInspectable& sender, const winrt::GettingFocusEventArgs& args) { if (args.InputDevice() == winrt::FocusInputDeviceKind::Keyboard) { @@ -2004,7 +2350,7 @@ void NavigationView::OnKeyDown(winrt::KeyRoutedEventArgs const& e) case winrt::VirtualKey::Left: auto altState = winrt::CoreWindow::GetForCurrentThread().GetKeyState(winrt::VirtualKey::Menu); bool isAltPressed = (altState & winrt::CoreVirtualKeyStates::Down) == winrt::CoreVirtualKeyStates::Down; - + if (isAltPressed && IsPaneOpen() && IsLightDismissible()) { handled = AttemptClosePaneLightly(); @@ -2028,8 +2374,8 @@ bool NavigationView::BumperNavigation(int offset) auto shoulderNavigationEnabledParamValue = ShoulderNavigationEnabled(); auto shoulderNavigationForcedDisabled = (shoulderNavigationEnabledParamValue == winrt::NavigationViewShoulderNavigationEnabled::Never); - if (!IsTopNavigationView() - || !IsNavigationViewListSingleSelectionFollowsFocus() + if (!IsTopNavigationView() + || !IsNavigationViewListSingleSelectionFollowsFocus() || shoulderNavigationForcedDisabled) { return false; @@ -2146,7 +2492,7 @@ winrt::DependencyObject NavigationView::ContainerFromMenuItem(winrt::IInspectabl void NavigationView::OnTopNavDataSourceChanged(winrt::NotifyCollectionChangedEventArgs const& args) { CloseTopNavigationViewFlyout(); - + // Assume that raw data doesn't change very often for navigationview. // So here is a simple implementation and for each data item change, it request a layout change // update this in the future if there is performance problem @@ -2157,9 +2503,7 @@ void NavigationView::OnTopNavDataSourceChanged(winrt::NotifyCollectionChangedEve m_topDataProvider.MoveAllItemsToPrimaryList(); } - m_indexOfLastSelectedItemInTopNav = 0; m_lastSelectedItemPendingAnimationInTopNav.set(nullptr); - m_itemsRemovedFromMenuFlyout.clear(); } int NavigationView::GetNavigationViewItemCountInPrimaryList() @@ -2214,7 +2558,7 @@ winrt::NavigationTransitionInfo NavigationView::CreateNavigationTransitionInfo(N } if ((recommendedTransitionDirection == NavigationRecommendedTransitionDirection::FromLeft - || recommendedTransitionDirection == NavigationRecommendedTransitionDirection::FromRight) + || recommendedTransitionDirection == NavigationRecommendedTransitionDirection::FromRight) && SharedHelpers::IsRS5OrHigher()) { winrt::SlideNavigationTransitionInfo sliderNav; @@ -2230,7 +2574,7 @@ winrt::NavigationTransitionInfo NavigationView::CreateNavigationTransitionInfo(N sliderNav.Effect(effect); } return sliderNav; - } + } else { winrt::EntranceNavigationTransitionInfo defaultInfo; @@ -2292,7 +2636,7 @@ void NavigationView::OnSelectedItemPropertyChanged(winrt::DependencyPropertyChan { ChangeSelectStatusForItem(oldItem, false /*selected*/); ChangeSelectStatusForItem(newItem, true /*selected*/); - AnimateSelectionChanged(oldItem, newItem); + AnimateSelectionChanged(newItem); } if (m_appliedTemplate && IsTopNavigationView()) @@ -2307,32 +2651,6 @@ void NavigationView::OnSelectedItemPropertyChanged(winrt::DependencyPropertyChan void NavigationView::SetSelectedItemAndExpectItemInvokeWhenSelectionChangedIfNotInvokedFromAPI(winrt::IInspectable const& item) { - // SelectedItem can be set by API or be clicking/selecting ListViewItem or by clicking on settings - if (IsTopNavigationView()) - { - bool shouldAnimateToSelectedItemFromFlyout = true; - - // if the last item selected is going to be removed, i.e. added to the menu flyout, then don't animate. - for (std::vector::iterator it = m_itemsRemovedFromMenuFlyout.begin(); it != m_itemsRemovedFromMenuFlyout.end(); ++it) - { - if (*it == m_indexOfLastSelectedItemInTopNav) - { - shouldAnimateToSelectedItemFromFlyout = false; - break; - } - } - - if (shouldAnimateToSelectedItemFromFlyout) - { - m_lastSelectedItemPendingAnimationInTopNav.set(SelectedItem()); - } - else - { - m_lastSelectedItemPendingAnimationInTopNav.set(nullptr); - } - - m_indexOfLastSelectedItemInTopNav = m_topDataProvider.IndexOf(item); // for the next time we animate - } SelectedItem(item); } @@ -2345,9 +2663,27 @@ void NavigationView::ChangeSelectStatusForItem(winrt::IInspectable const& item, // If we select an item, we follow the unselect to simplify the code. container.IsSelected(selected); } - } - -bool NavigationView::IsSettingsItem(winrt::IInspectable const& item) + else if (selected) + { + // If we are selecting an item and have not found a realized container for it, + // we may need to manually resolve a container for this in order to update the + // SelectionModel's selected IndexPath. + auto const ip = GetIndexPathOfItem(item); + if (ip && ip.GetSize() > 0) + { + // The SelectedItem property has already been updated. So we want to block any logic from executing + // in the SelectionModel selection changed callback. + auto scopeGuard = gsl::finally([this]() + { + m_shouldIgnoreNextSelectionChange = false; + }); + m_shouldIgnoreNextSelectionChange = true; + UpdateSelectionModelSelection(ip); + } + } +} + +bool NavigationView::IsSettingsItem(winrt::IInspectable const& item) { bool isSettingsItem = false; if (item) @@ -2365,25 +2701,25 @@ void NavigationView::UnselectPrevItem(winrt::IInspectable const& prevItem, winrt if (prevItem && prevItem != nextItem) { auto scopeGuard = gsl::finally([this, setIgnoreNextSelectionChangeToFalse = !m_shouldIgnoreNextSelectionChange]() + { + if (setIgnoreNextSelectionChangeToFalse) { - if (setIgnoreNextSelectionChangeToFalse) - { - m_shouldIgnoreNextSelectionChange = false; - } - }); + m_shouldIgnoreNextSelectionChange = false; + } + }); m_shouldIgnoreNextSelectionChange = true; ChangeSelectStatusForItem(prevItem, false /*selected*/); } } void NavigationView::UndoSelectionAndRevertSelectionTo(winrt::IInspectable const& prevSelectedItem, winrt::IInspectable const& nextItem) -{ +{ winrt::IInspectable selectedItem{ nullptr }; if (prevSelectedItem) { if (IsSelectionSuppressed(prevSelectedItem)) { - AnimateSelectionChanged(prevSelectedItem, nullptr); + AnimateSelectionChanged(nullptr); } else { @@ -2404,9 +2740,9 @@ void NavigationView::UndoSelectionAndRevertSelectionTo(winrt::IInspectable const void NavigationView::CloseTopNavigationViewFlyout() { if (auto button = m_topNavOverflowButton.get()) - { + { if (auto flyout = button.Flyout()) - { + { flyout.Hide(); } } @@ -2435,8 +2771,8 @@ void NavigationView::UpdateVisualState(bool useTransitions) void NavigationView::UpdateVisualStateForOverflowButton() { - auto state = (OverflowLabelMode() == winrt::NavigationViewOverflowLabelMode::MoreLabel)? - L"OverflowButtonWithLabel": + auto state = (OverflowLabelMode() == winrt::NavigationViewOverflowLabelMode::MoreLabel) ? + L"OverflowButtonWithLabel" : L"OverflowButtonNoLabel"; winrt::VisualStateManager::GoToState(*this, state, false /* useTransitions*/); } @@ -2541,7 +2877,7 @@ void NavigationView::HandleTopNavigationMeasureOverride(winrt::Size const& avail } } -void NavigationView::HandleTopNavigationMeasureOverrideNormal(const winrt::Windows::Foundation::Size & availableSize) +void NavigationView::HandleTopNavigationMeasureOverrideNormal(const winrt::Windows::Foundation::Size& availableSize) { auto desiredWidth = MeasureTopNavigationViewDesiredWidth(c_infSize); if (desiredWidth > availableSize.Width) @@ -2550,7 +2886,7 @@ void NavigationView::HandleTopNavigationMeasureOverrideNormal(const winrt::Windo } } -void NavigationView::HandleTopNavigationMeasureOverrideOverflow(const winrt::Windows::Foundation::Size & availableSize) +void NavigationView::HandleTopNavigationMeasureOverrideOverflow(const winrt::Windows::Foundation::Size& availableSize) { auto desiredWidth = MeasureTopNavigationViewDesiredWidth(c_infSize); if (desiredWidth > availableSize.Width) @@ -2567,7 +2903,7 @@ void NavigationView::HandleTopNavigationMeasureOverrideOverflow(const winrt::Win } else { - auto movableItems = FindMovableItemsRecoverToPrimaryList(availableSize.Width- desiredWidth, {}/*includeItems*/); + auto movableItems = FindMovableItemsRecoverToPrimaryList(availableSize.Width - desiredWidth, {}/*includeItems*/); m_topDataProvider.MoveItemsToPrimaryList(movableItems); } } @@ -2582,7 +2918,7 @@ void NavigationView::ArrangeTopNavItems(winrt::Size const& availableSize) // overflow SetOverflowButtonVisibility(winrt::Visibility::Visible); auto desiredWidthForOverflowButton = MeasureTopNavigationViewDesiredWidth(c_infSize); - + MUX_ASSERT(desiredWidthForOverflowButton >= desiredWidth); m_topDataProvider.OverflowButtonWidth(desiredWidthForOverflowButton - desiredWidth); @@ -2591,20 +2927,33 @@ void NavigationView::ArrangeTopNavItems(winrt::Size const& availableSize) } void NavigationView::SetOverflowButtonVisibility(winrt::Visibility const& visibility) -{ +{ if (visibility != TemplateSettings().OverflowButtonVisibility()) { - GetTemplateSettings()->OverflowButtonVisibility(visibility); + GetTemplateSettings()->OverflowButtonVisibility(visibility); } } -void NavigationView::SelectOverflowItem(winrt::IInspectable const& item) +void NavigationView::SelectOverflowItem(winrt::IInspectable const& item, winrt::IndexPath const& ip) { + + auto const itemBeingMoved = [item, ip, this]() + { + if (ip.GetSize() > 1) + { + auto indexOfParentInOverflow = m_topDataProvider.ConvertOriginalIndexToIndex(ip.GetAt(0)); + // We want to make sure that container is collapsed before movement + CollapseAllMenuItemsUnderRepeater(m_topNavRepeaterOverflowView.get()); + return GetItemFromIndex(m_topNavRepeaterOverflowView.get(), indexOfParentInOverflow); + } + return item; + }(); + // Calculate selected overflow item size. - auto selectedOverflowItemIndex = m_topDataProvider.IndexOf(item); + auto selectedOverflowItemIndex = m_topDataProvider.IndexOf(itemBeingMoved); MUX_ASSERT(selectedOverflowItemIndex != s_itemNotFound); auto selectedOverflowItemWidth = m_topDataProvider.GetWidthForItem(selectedOverflowItemIndex); - + bool needInvalidMeasure = !m_topDataProvider.IsValidWidthForItem(selectedOverflowItemIndex); if (!needInvalidMeasure) @@ -2630,8 +2979,7 @@ void NavigationView::SelectOverflowItem(winrt::IInspectable const& item) // calculate items to be removed from primary because a overflow item is selected. // SelectedItem is assumed to be removed from primary first, then added it back if it should not be removed auto itemsToBeRemoved = FindMovableItemsToBeRemovedFromPrimaryList(widthAtLeastToBeRemoved, { } /*excludeItems*/); - m_itemsRemovedFromMenuFlyout = itemsToBeRemoved; - + // calculate the size to be removed auto toBeRemovedItemWidth = m_topDataProvider.CalculateWidthForItems(itemsToBeRemoved); @@ -2640,6 +2988,25 @@ void NavigationView::SelectOverflowItem(winrt::IInspectable const& item) CollectionHelper::unique_push_back(itemsToBeAdded, selectedOverflowItemIndex); + // Keep track of the item being moved in order to know where to animate selection indicator + m_lastSelectedItemPendingAnimationInTopNav.set(itemBeingMoved); + if (ip && ip.GetSize() > 0) + { + for (std::vector::iterator it = itemsToBeRemoved.begin(); it != itemsToBeRemoved.end(); ++it) + { + if (*it == ip.GetAt(0)) + { + if (auto const indicator = m_activeIndicator.get()) + { + // If the previously selected item is being moved into overflow, hide its indicator + // as we will no longer need to animate from its location. + AnimateSelectionChanged(nullptr); + } + break; + } + } + } + if (m_topDataProvider.HasInvalidWidth(itemsToBeAdded)) { needInvalidMeasure = true; @@ -2665,12 +3032,13 @@ void NavigationView::SelectOverflowItem(winrt::IInspectable const& item) } } + // TODO: Verify that this is no longer needed and delete if (needInvalidMeasure) { // not all items have known width, need to redo the layout m_topDataProvider.MoveAllItemsToPrimaryList(); SetSelectedItemAndExpectItemInvokeWhenSelectionChangedIfNotInvokedFromAPI(item); - InvalidateTopNavPrimaryLayout(); + InvalidateTopNavPrimaryLayout(); } } @@ -2727,7 +3095,7 @@ bool NavigationView::NeedRearrangeOfTopElementsAfterOverflowSelectionChanged(int } void NavigationView::ShrinkTopNavigationSize(float desiredWidth, winrt::Size const& availableSize) -{ +{ UpdateTopNavigationWidthCache(); auto selectedItemIndex = GetSelectedItemIndex(); @@ -2752,7 +3120,7 @@ void NavigationView::ShrinkTopNavigationSize(float desiredWidth, winrt::Size con // At least one item is kept on primary list KeepAtLeastOneItemInPrimaryList(itemToBeRemoved, false/*shouldKeepFirst*/); - + // There should be no item is virtualized in this step MUX_ASSERT(!m_topDataProvider.HasInvalidWidth(itemToBeRemoved)); m_topDataProvider.MoveItemsOutOfPrimaryList(itemToBeRemoved); @@ -2764,7 +3132,7 @@ std::vector NavigationView::FindMovableItemsRecoverToPrimaryList(float avai std::vector toBeMoved; auto size = m_topDataProvider.Size(); - + // Included Items take high priority, all of them are included in recovery list for (auto index : includeItems) { @@ -2819,7 +3187,7 @@ std::vector NavigationView::FindMovableItemsToBeRemovedFromPrimaryList(floa } i--; } - + return toBeMoved; } @@ -2833,7 +3201,7 @@ std::vector NavigationView::FindMovableItemsBeyondAvailableWidth(float avai float requiredWidth = 0; - for (int i = 0; i T NavigationView::GetContainerForData(const winrt::IInspect return nvi; } + if (auto settingsItem = m_settingsItem.get()) + { + if (settingsItem == data || settingsItem.Content() == data) + { + return settingsItem.try_as(); + } + } + + // First conduct a basic top level search, which should succeed for a lot of scenarios. auto ir = IsTopNavigationView() ? m_topNavRepeater.get() : m_leftNavRepeater.get(); auto itemIndex = GetIndexFromItem(ir, data); if (ir && itemIndex >= 0) @@ -3848,17 +4226,202 @@ template T NavigationView::GetContainerForData(const winrt::IInspect } } - if (auto settingsItem = m_settingsItem.get()) + // If unsuccessful, unfortunately we are going to have to search through the whole tree + // TODO: Either fix or remove implementation for TopNav. + // It may not be required due to top nav rarely having realized children in its default state. + auto const repeater = IsTopNavigationView() ? m_topNavRepeater.get() : m_leftNavRepeater.get(); + if (auto const container = SearchEntireTreeForContainer(repeater, data)) { - if (settingsItem == data || settingsItem.Content() == data) + return container.try_as(); + } + + return nullptr; +} + +winrt::UIElement NavigationView::SearchEntireTreeForContainer(const winrt::ItemsRepeater& rootRepeater, const winrt::IInspectable& data) +{ + // TODO: Temporary inefficient solution that results in unnecessary time complexity, fix. + auto index = GetIndexFromItem(rootRepeater, data); + if (index != -1) + { + return rootRepeater.TryGetElement(index); + } + + for (int i = 0; i < GetContainerCountInRepeater(rootRepeater); i++) + { + if (auto const container = rootRepeater.TryGetElement(i)) { - return settingsItem.try_as(); + if (auto const nvi = container.try_as()) + { + if (auto const nviRepeater = winrt::get_self(nvi)->GetRepeater()) + { + if (auto const foundElement = SearchEntireTreeForContainer(nviRepeater, data)) + { + return foundElement; + } + } + } } } + return nullptr; +} +winrt::IndexPath NavigationView::SearchEntireTreeForIndexPath(const winrt::ItemsRepeater& rootRepeater, const winrt::IInspectable& data) +{ + for (int i = 0; i < GetContainerCountInRepeater(rootRepeater); i++) + { + if (auto const container = rootRepeater.TryGetElement(i)) + { + if (auto const nvi = container.try_as()) + { + auto const ip = winrt::make(std::vector({ i })); + if (auto const indexPath = SearchEntireTreeForIndexPath(nvi, data, ip)) + { + return indexPath; + } + } + } + } + return nullptr; +} + +// There are two possibilities here if the passed in item has children. Either the children of the passed in container have already been realized, +// in which case we simply just iterate through the children containers, or they have not been realized yet and we have to iterate through the data +// and manually realize each item. +winrt::IndexPath NavigationView::SearchEntireTreeForIndexPath(const winrt::NavigationViewItem& parentContainer, const winrt::IInspectable& data, const winrt::IndexPath& ip) +{ + bool areChildrenRealized = false; + if (auto const childrenRepeater = winrt::get_self(parentContainer)->GetRepeater()) + { + if (DoesRepeaterHaveRealizedContainers(childrenRepeater)) + { + areChildrenRealized = true; + for (int i = 0; i < GetContainerCountInRepeater(childrenRepeater); i++) + { + if (auto const container = childrenRepeater.TryGetElement(i)) + { + if (auto const nvi = container.try_as()) + { + auto const newIndexPath = winrt::get_self(ip)->CloneWithChildIndex(i); + if (nvi.Content() == data) + { + return newIndexPath; + } + else + { + if (auto const foundIndexPath = SearchEntireTreeForIndexPath(nvi, data, newIndexPath)) + { + return foundIndexPath; + } + } + } + } + } + } + } + + //If children are not realized, manually realize and search. + if (!areChildrenRealized) + { + if (auto const childrenData = GetChildren(parentContainer)) + { + // Get children data in an enumarable form + auto newDataSource = childrenData.try_as(); + if (childrenData && !newDataSource) + { + newDataSource = winrt::ItemsSourceView(childrenData); + } + + for (int i = 0; i < newDataSource.Count(); i++) + { + auto const newIndexPath = winrt::get_self(ip)->CloneWithChildIndex(i); + auto const childData = newDataSource.GetAt(i); + if (childData == data) + { + return newIndexPath; + } + else + { + // Resolve databinding for item and search through that item's children + if (auto const nvib = ResolveContainerForItem(childData, i)) + { + if (auto const nvi = nvib.try_as()) + { + // Process x:bind + if (auto extension = CachedVisualTreeHelpers::GetDataTemplateComponent(nvi)) + { + // Clear out old data. + extension.Recycle(); + int nextPhase = VirtualizationInfo::PhaseReachedEnd; + // Run Phase 0 + extension.ProcessBindings(childData, i, 0 /* currentPhase */, nextPhase); + + // TODO: If nextPhase is not -1, ProcessBinding for all the phases + } + + if (auto const foundIndexPath = SearchEntireTreeForIndexPath(nvi, data, newIndexPath)) + { + return foundIndexPath; + } + + //TODO: Recycle container! + } + } + } + } + } + } + + return nullptr; +} + +winrt::NavigationViewItemBase NavigationView::ResolveContainerForItem(const winrt::IInspectable& item, int index) +{ + auto const args = winrt::make_self(); + args->Data(item); + args->Index(index); + + if (auto container = m_navigationViewItemsFactory.get()->GetElement(static_cast(*args))) + { + if (auto nvib = container.try_as()) + { + return nvib; + } + } return nullptr; } +void NavigationView::RecycleContainer(const winrt::UIElement& container) +{ + auto const args = winrt::make_self(); + args->Element(container); + m_navigationViewItemsFactory.get()->RecycleElement(static_cast(*args)); +} + +int NavigationView::GetContainerCountInRepeater(const winrt::ItemsRepeater& ir) +{ + if (ir) + { + if (auto const repeaterItemSourceView = ir.ItemsSourceView()) + { + return repeaterItemSourceView.Count(); + } + } + return -1; +} + +bool NavigationView::DoesRepeaterHaveRealizedContainers(const winrt::ItemsRepeater& ir) +{ + if (ir) + { + if (ir.TryGetElement(0)) + { + return true; + } + } + return false; +} + int NavigationView::GetIndexFromItem(const winrt::ItemsRepeater& ir, const winrt::IInspectable& data) { if (ir) @@ -3884,34 +4447,110 @@ winrt::IInspectable NavigationView::GetItemFromIndex(const winrt::ItemsRepeater& return nullptr; } -winrt::NavigationViewItemBase NavigationView::GetContainerForIndexPath(const winrt::IndexPath& indexPath) +winrt::IndexPath NavigationView::GetIndexPathOfItem(const winrt::IInspectable& data) { - if (indexPath && indexPath.GetSize() > 0) + if (auto const nvib = data.try_as()) { - auto index = indexPath.GetAt(0); - if (IsTopNavigationView()) + return GetIndexPathForContainer(nvib); + } + + // In the databinding scenario, we need to conduct a search where we go through every item, + // realizing it if necessary. + if (IsTopNavigationView()) + { + // First search through primary list + if (auto const ip = SearchEntireTreeForIndexPath(m_topNavRepeater.get(), data)) + { + return ip; + } + + // If item was not located in primary list, search through overflow + if (auto const ip = SearchEntireTreeForIndexPath(m_topNavRepeaterOverflowView.get(), data)) + { + return ip; + } + } + else + { + if (auto const ip = SearchEntireTreeForIndexPath(m_leftNavRepeater.get(), data)) { - // Get the repeater that is presenting this item - auto ir = m_topDataProvider.IsItemInPrimaryList(index) ? m_topNavRepeater.get() : m_topNavRepeaterOverflowView.get(); + return ip; + } + } - // Get the index of the item in the repeater - auto irIndex = m_topDataProvider.ConvertOriginalIndexToIndex(index); + return winrt::make(std::vector(0)); +} - // Get the container of the item - if (auto container = ir.TryGetElement(irIndex)) - { - return container.try_as(); - } +winrt::UIElement NavigationView::GetContainerForIndex(int index) +{ + if (IsTopNavigationView()) + { + // Get the repeater that is presenting the first item + auto ir = m_topDataProvider.IsItemInPrimaryList(index) ? m_topNavRepeater.get() : m_topNavRepeaterOverflowView.get(); + + // Get the index of the first item in the repeater + auto irIndex = m_topDataProvider.ConvertOriginalIndexToIndex(index); + + // Get the container of the first item + if (auto const container = ir.TryGetElement(irIndex)) + { + return container; } - else + } + else + { + if (auto const container = m_leftNavRepeater.get().TryGetElement(index)) { - if (auto container = m_leftNavRepeater.get().TryGetElement(index)) + return container; + } + } + return nullptr; +} + +winrt::NavigationViewItemBase NavigationView::GetContainerForIndexPath(const winrt::IndexPath& ip) +{ + if (ip && ip.GetSize() > 0) + { + if (auto const container = GetContainerForIndex(ip.GetAt(0))) + { + // TODO: Fix below for top flyout scenario once the flyout is introduced in the XAML. + // We want to be able to retrieve containers for items that are in the flyout. + // This will return nullptr if requesting children containers of + // items in the primary list, or unrealized items in the overflow popup. + // However this should not happen. + return GetContainerForIndexPath(container, ip); + } + } + return nullptr; +} + +winrt::NavigationViewItemBase NavigationView::GetContainerForIndexPath(const winrt::UIElement& firstContainer, const winrt::IndexPath& ip) +{ + auto container = firstContainer; + if (ip.GetSize() > 1) + { + for (int i = 1; i < ip.GetSize(); i++) + { + bool succeededGettingNextContainer = false; + if (auto const nvi = container.try_as()) { - return container.try_as(); + if (auto const nviRepeater = winrt::get_self(nvi)->GetRepeater()) + { + if (auto const nextContainer = nviRepeater.TryGetElement(ip.GetAt(i))) + { + container = nextContainer; + succeededGettingNextContainer = true; + } + } + } + // If any of the above checks failed, it means something went wrong and we have an index for a non-existent repeater. + if (!succeededGettingNextContainer) + { + return nullptr; } } } - return nullptr; + return container.try_as(); } bool NavigationView::IsContainerTheSelectedItemInTheSelectionModel(const winrt::NavigationViewItemBase& nvib) @@ -3962,3 +4601,258 @@ winrt::NavigationViewItem NavigationView::GetSelectedContainer() } return nullptr; } + +void NavigationView::Expand(const winrt::NavigationViewItem& item) +{ + ChangeIsExpandedNavigationViewItem(item, true /*isExpanded*/); +} + +void NavigationView::Collapse(const winrt::NavigationViewItem& item) +{ + ChangeIsExpandedNavigationViewItem(item, false /*isExpanded*/); +} + +bool NavigationView::DoesNavigationViewItemHaveChildren(const winrt::NavigationViewItem& nvi) +{ + return nvi.MenuItems().Size() > 0 || nvi.MenuItemsSource() != nullptr || nvi.HasUnrealizedChildren(); +} + +void NavigationView::ToggleIsExpandedNavigationViewItem(const winrt::NavigationViewItem& nvi) +{ + ChangeIsExpandedNavigationViewItem(nvi, !nvi.IsExpanded()); +} + +void NavigationView::ChangeIsExpandedNavigationViewItem(const winrt::NavigationViewItem& nvi, bool isExpanded) +{ + if (DoesNavigationViewItemHaveChildren(nvi)) + { + nvi.IsExpanded(isExpanded); + } +} + +winrt::NavigationViewItem NavigationView::FindLowestLevelContainerToDisplaySelectionIndicator() +{ + auto indexIntoIndex = 0; + auto const selectedIndex = m_selectionModel.SelectedIndex(); + if (selectedIndex && selectedIndex.GetSize() > 0) + { + if (auto container = GetContainerForIndex(selectedIndex.GetAt(indexIntoIndex))) + { + if (auto nvi = container.try_as()) + { + auto nviImpl = winrt::get_self(nvi); + auto isRepeaterVisible = nviImpl->IsRepeaterVisible(); + while (nvi && isRepeaterVisible && !nvi.IsSelected() && nvi.IsChildSelected()) + { + indexIntoIndex++; + isRepeaterVisible = false; + if (auto const repeater = nviImpl->GetRepeater()) + { + if (auto const childContainer = repeater.TryGetElement(selectedIndex.GetAt(indexIntoIndex))) + { + nvi = childContainer.try_as(); + nviImpl = winrt::get_self(nvi); + isRepeaterVisible = nviImpl->IsRepeaterVisible(); + } + } + } + return nvi; + } + } + } + return nullptr; +} + +void NavigationView::ShowHideChildrenItemsRepeater(const winrt::NavigationViewItem& nvi) +{ + auto nviImpl = winrt::get_self(nvi); + + nviImpl->ShowChildren(nvi.IsExpanded()); + + if (nviImpl->ShouldRepeaterShowInFlyout()) + { + nvi.IsExpanded() ? m_lastItemExpandedIntoFlyout.set(nvi) : m_lastItemExpandedIntoFlyout.set(nullptr); + } + + // If SelectedItem is being hidden/shown, animate SelectionIndicator + if (!nvi.IsSelected() && nvi.IsChildSelected()) + { + if (!nviImpl->IsRepeaterVisible() && nvi.IsChildSelected()) + { + AnimateSelectionChanged(nvi); + } + else + { + AnimateSelectionChanged(FindLowestLevelContainerToDisplaySelectionIndicator()); + } + } + + nviImpl->RotateExpandCollapseChevron(nvi.IsExpanded()); +} + +winrt::IInspectable NavigationView::GetChildren(const winrt::NavigationViewItem& nvi) +{ + if (nvi.MenuItems().Size() > 0) + { + return nvi.MenuItems(); + } + return nvi.MenuItemsSource(); +} + +winrt::ItemsRepeater NavigationView::GetChildRepeaterForIndexPath(const winrt::IndexPath& ip) +{ + if (auto const container = GetContainerForIndexPath(ip).try_as()) + { + return winrt::get_self(container)->GetRepeater(); + } + return nullptr; +} + + +winrt::IInspectable NavigationView::GetChildrenForItemInIndexPath(const winrt::IndexPath& ip, bool forceRealize) +{ + if (ip && ip.GetSize() > 0) + { + if (auto const container = GetContainerForIndex(ip.GetAt(0))) + { + return GetChildrenForItemInIndexPath(container, ip, forceRealize); + } + } + return nullptr; +} + +winrt::IInspectable NavigationView::GetChildrenForItemInIndexPath(const winrt::UIElement& firstContainer, const winrt::IndexPath& ip, bool forceRealize) +{ + auto container = firstContainer; + bool shouldRecycleContainer = false; + if (ip.GetSize() > 1) + { + for (int i = 1; i < ip.GetSize(); i++) + { + bool succeededGettingNextContainer = false; + if (auto const nvi = container.try_as()) + { + auto const nextContainerIndex = ip.GetAt(i); + auto const nviRepeater = winrt::get_self(nvi)->GetRepeater(); + if (nviRepeater && DoesRepeaterHaveRealizedContainers(nviRepeater)) + { + if (auto const nextContainer = nviRepeater.TryGetElement(nextContainerIndex)) + { + container = nextContainer; + succeededGettingNextContainer = true; + } + } + else if (forceRealize) + { + if (auto const childrenData = GetChildren(nvi)) + { + if (shouldRecycleContainer) + { + RecycleContainer(nvi); + shouldRecycleContainer = false; + } + + // Get children data in an enumarable form + auto newDataSource = childrenData.try_as(); + if (childrenData && !newDataSource) + { + newDataSource = winrt::ItemsSourceView(childrenData); + } + + if (auto const data = newDataSource.GetAt(nextContainerIndex)) + { + // Resolve databinding for item and search through that item's children + if (auto const nvib = ResolveContainerForItem(data, nextContainerIndex)) + { + if (auto const nextContainer = nvib.try_as()) + { + // Process x:bind + if (auto extension = CachedVisualTreeHelpers::GetDataTemplateComponent(nextContainer)) + { + // Clear out old data. + extension.Recycle(); + int nextPhase = VirtualizationInfo::PhaseReachedEnd; + // Run Phase 0 + extension.ProcessBindings(data, nextContainerIndex, 0 /* currentPhase */, nextPhase); + + // TODO: If nextPhase is not -1, ProcessBinding for all the phases + } + + container = nextContainer; + shouldRecycleContainer = true; + succeededGettingNextContainer = true; + } + } + } + } + } + + } + // If any of the above checks failed, it means something went wrong and we have an index for a non-existent repeater. + if (!succeededGettingNextContainer) + { + return nullptr; + } + } + } + + if (auto const nvi = container.try_as()) + { + auto const children = GetChildren(nvi); + if (shouldRecycleContainer) + { + RecycleContainer(nvi); + } + return children; + } + + return nullptr; +} + +void NavigationView::CollapseAllMenuItems(winrt::NavigationViewPaneDisplayMode oldDisplayMode) +{ + // We want to make sure only top level items are visible when switching pane modes + if (oldDisplayMode == winrt::NavigationViewPaneDisplayMode::Top) + { + CollapseAllMenuItemsUnderRepeater(m_topNavRepeater.get()); + CollapseAllMenuItemsUnderRepeater(m_topNavRepeaterOverflowView.get()); + } + else + { + CollapseAllMenuItemsUnderRepeater(m_leftNavRepeater.get()); + } +} + +void NavigationView::CollapseAllMenuItemsUnderRepeater(const winrt::ItemsRepeater& ir) +{ + for (int index = 0; index < GetContainerCountInRepeater(ir); index++) + { + if (auto const element = ir.TryGetElement(index)) + { + if (auto const nvi = element.try_as()) + { + CollapseAllMenuItemsUnderRepeater(winrt::get_self(nvi)->GetRepeater()); + ChangeIsExpandedNavigationViewItem(nvi, false /*isExpanded*/); + } + } + } +} + +void NavigationView::RaiseExpandingEvent(const winrt::NavigationViewItemBase& container) +{ + auto eventArgs = winrt::make_self(); + eventArgs->ExpandingItemContainer(container); + m_expandingEventSource(*this, *eventArgs); +} + +void NavigationView::RaiseCollapsedEvent(const winrt::NavigationViewItemBase& container) +{ + auto eventArgs = winrt::make_self(); + eventArgs->CollapsedItemContainer(container); + m_collapsedEventSource(*this, *eventArgs); +} + +bool NavigationView::IsTopLevelItem(const winrt::NavigationViewItemBase& nvib) +{ + return IsRootItemsRepeater(GetParentItemsRepeaterForContainer(nvib)); +} diff --git a/dev/NavigationView/NavigationView.h b/dev/NavigationView/NavigationView.h index 7fb2630cd5..61ae5a4f1d 100644 --- a/dev/NavigationView/NavigationView.h +++ b/dev/NavigationView/NavigationView.h @@ -75,14 +75,81 @@ class NavigationView : void CoerceToGreaterThanZero(double& value); - void OnNavigationViewItemInvoked(const winrt::NavigationViewItem& nvi); + void OnRepeaterElementPrepared(const winrt::ItemsRepeater& ir, const winrt::ItemsRepeaterElementPreparedEventArgs& args); + void OnRepeaterElementClearing(const winrt::ItemsRepeater& ir, const winrt::ItemsRepeaterElementClearingEventArgs& args); + + com_ptr GetNavigationViewItemsFactory() { return m_navigationViewItemsFactory; }; // Used in AutomationPeer winrt::ItemsRepeater LeftNavRepeater(); winrt::NavigationViewItem GetSelectedContainer(); + // Hierarchical related functions + void Expand(const winrt::NavigationViewItem& item); + void Collapse(const winrt::NavigationViewItem& item); + + // Selection handling functions + void OnNavigationViewItemInvoked(const winrt::NavigationViewItem& nvi); + private: - void ClosePaneIfNeccessaryAfterItemIsClicked(); + + void OnRepeaterGettingFocus(const winrt::IInspectable& sender, const winrt::GettingFocusEventArgs& args); + + // Selection handling functions + void OnNavigationViewItemIsSelectedPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args); + void OnSelectionModelSelectionChanged(const winrt::SelectionModel& selectionModel, const winrt::SelectionModelSelectionChangedEventArgs& e); + void OnSelectionModelChildrenRequested(const winrt::SelectionModel& selectionModel, const winrt::SelectionModelChildrenRequestedEventArgs& e); + void OnSelectedItemPropertyChanged(winrt::DependencyPropertyChangedEventArgs const& args); + void ChangeSelection(const winrt::IInspectable& prevItem, const winrt::IInspectable& nextItem); + void UpdateSelectionModelSelection(const winrt::IndexPath& ip); + + // Item/container info functions + int GetIndexFromItem(const winrt::ItemsRepeater& ir, const winrt::IInspectable& data); + static winrt::IInspectable GetItemFromIndex(const winrt::ItemsRepeater& ir, int index); + winrt::IndexPath GetIndexPathOfItem(const winrt::IInspectable& data); + winrt::IndexPath GetIndexPathForContainer(const winrt::NavigationViewItemBase& nvib); + winrt::UIElement GetContainerForIndex(int index); + winrt::NavigationViewItemBase GetContainerForIndexPath(const winrt::IndexPath& ip); + winrt::NavigationViewItemBase GetContainerForIndexPath(const winrt::UIElement& firstContainer, const winrt::IndexPath& ip); + winrt::IInspectable GetChildrenForItemInIndexPath(const winrt::IndexPath& ip, bool forceRealize = false); + winrt::IInspectable GetChildrenForItemInIndexPath(const winrt::UIElement& firstContainer, const winrt::IndexPath& ip, bool forceRealize = false); + winrt::UIElement SearchEntireTreeForContainer(const winrt::ItemsRepeater& rootRepeater, const winrt::IInspectable& data); + winrt::IndexPath SearchEntireTreeForIndexPath(const winrt::ItemsRepeater& rootRepeater, const winrt::IInspectable& data); + winrt::IndexPath SearchEntireTreeForIndexPath(const winrt::NavigationViewItem& parentContainer, const winrt::IInspectable& data, const winrt::IndexPath& ip); + + winrt::ItemsRepeater GetChildRepeaterForIndexPath(const winrt::IndexPath& ip); + winrt::ItemsRepeater GetParentItemsRepeaterForContainer(const winrt::NavigationViewItemBase& nvib); + winrt::NavigationViewItem GetParentNavigationViewItemForContainer(const winrt::NavigationViewItemBase& nvib); + bool IsContainerTheSelectedItemInTheSelectionModel(const winrt::NavigationViewItemBase& nvib); + bool IsContainerInOverflow(const winrt::NavigationViewItemBase& nvib); + int GetContainerCountInRepeater(const winrt::ItemsRepeater& ir); + bool DoesRepeaterHaveRealizedContainers(const winrt::ItemsRepeater& ir); + bool IsSettingsItem(winrt::IInspectable const& item); + bool IsSelectionSuppressed(const winrt::IInspectable& item); + bool DoesNavigationViewItemHaveChildren(const winrt::NavigationViewItem& nvi); + bool IsTopLevelItem(const winrt::NavigationViewItemBase& nvib); + winrt::IInspectable GetChildren(const winrt::NavigationViewItem& nvi); + + // Hierarchy related functions + void ToggleIsExpandedNavigationViewItem(const winrt::NavigationViewItem& nvi); + void ChangeIsExpandedNavigationViewItem(const winrt::NavigationViewItem& nvi, bool isExpanded); + void ShowHideChildrenItemsRepeater(const winrt::NavigationViewItem& nvi); + winrt::NavigationViewItem FindLowestLevelContainerToDisplaySelectionIndicator(); + void UpdateIsChildSelectedForIndexPath(const winrt::IndexPath& ip, bool isChildSelected); + void UpdateIsChildSelected(const winrt::IndexPath& prevIP, const winrt::IndexPath& nextIP); + void CollapseAllMenuItems(winrt::NavigationViewPaneDisplayMode oldDisplayMode); + void CollapseAllMenuItemsUnderRepeater(const winrt::ItemsRepeater& ir); + void RaiseExpandingEvent(const winrt::NavigationViewItemBase& container); + void RaiseCollapsedEvent(const winrt::NavigationViewItemBase& container); + void CloseFlyoutIfRequired(); + + // Force realization functions + winrt::NavigationViewItemBase ResolveContainerForItem(const winrt::IInspectable& item, int index); + void RecycleContainer(const winrt::UIElement& container); + + void OnFlyoutClosing(const winrt::IInspectable& sender, const winrt::FlyoutBaseClosingEventArgs& args); + + void ClosePaneIfNeccessaryAfterItemIsClicked(const winrt::NavigationViewItem& selectedItem); bool NeedTopPaddingForRS5OrHigher(winrt::CoreApplicationViewTitleBar const& coreTitleBar); void OnAccessKeyInvoked(winrt::IInspectable const& sender, winrt::AccessKeyInvokedEventArgs const& args); winrt::NavigationTransitionInfo CreateNavigationTransitionInfo(NavigationRecommendedTransitionDirection recommendedTransitionDirection); @@ -90,7 +157,6 @@ class NavigationView : inline NavigationViewTemplateSettings* GetTemplateSettings(); inline bool IsNavigationViewListSingleSelectionFollowsFocus(); inline void UpdateSingleSelectionFollowsFocusTemplateSetting(); - void OnSelectedItemPropertyChanged(winrt::DependencyPropertyChangedEventArgs const& args); void SetSelectedItemAndExpectItemInvokeWhenSelectionChangedIfNotInvokedFromAPI(winrt::IInspectable const& item); void ChangeSelectStatusForItem(winrt::IInspectable const& item, bool selected); void UnselectPrevItem(winrt::IInspectable const& prevItem, winrt::IInspectable const& nextItem); @@ -104,15 +170,13 @@ class NavigationView : void UpdatePaneShadow(); void UpdateNavigationViewItemsFactory(); void SyncItemTemplates(); - winrt::IndexPath GetIndexPathForContainer(const winrt::NavigationViewItemBase& nvib); - winrt::ItemsRepeater GetParentItemsRepeaterForContainer(const winrt::NavigationViewItemBase& nvib); + bool IsRootGridOfFlyout(const winrt::DependencyObject& element); bool IsRootItemsRepeater(const winrt::DependencyObject& element); void RaiseItemInvoked(winrt::IInspectable const& item, bool isSettings, winrt::NavigationViewItemBase const& container = nullptr, NavigationRecommendedTransitionDirection recommendedDirection = NavigationRecommendedTransitionDirection::Default); void RaiseItemInvokedForNavigationViewItem(const winrt::NavigationViewItem& nvi); - bool IsSettingsItem(winrt::IInspectable const& item); void HandleKeyEventForNavigationViewItem(const winrt::NavigationViewItem& nvi, const winrt::KeyRoutedEventArgs& args); // This property is attached to the NavigationViewItems that are being @@ -132,7 +196,8 @@ class NavigationView : void HandleTopNavigationMeasureOverrideNormal(const winrt::Windows::Foundation::Size & availableSize); void HandleTopNavigationMeasureOverrideOverflow(const winrt::Windows::Foundation::Size & availableSize); void SetOverflowButtonVisibility(winrt::Visibility const& visibility); - void SelectOverflowItem(winrt::IInspectable const& item); + void SelectOverflowItem(winrt::IInspectable const& item, winrt::IndexPath const& ip); + void SelectandMoveOverflowItem(winrt::IInspectable const& selectedItem, winrt::IndexPath const& selectedIndex, bool closeFlyout); void ResetAndRearrangeTopNavItems(winrt::Size const& availableSize); void ArrangeTopNavItems(winrt::Size const& availableSize); @@ -186,39 +251,35 @@ class NavigationView : // Event Handlers void OnPaneToggleButtonClick(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& args); + void OnPaneSearchButtonClick(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& args); + void OnPaneTitleHolderSizeChanged(const winrt::IInspectable& sender, const winrt::SizeChangedEventArgs& args); + void OnNavigationViewItemTapped(const winrt::IInspectable& sender, const winrt::TappedRoutedEventArgs& args); void OnNavigationViewItemKeyDown(const winrt::IInspectable& sender, const winrt::KeyRoutedEventArgs& args); void OnNavigationViewItemKeyUp(const winrt::IInspectable& sender, const winrt::KeyRoutedEventArgs& args); - void OnNavigationViewItemOnGotFocus(const winrt::IInspectable& sender, const winrt::RoutedEventArgs & e); - void OnPaneSearchButtonClick(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& args); - void OnPaneTitleHolderSizeChanged(const winrt::IInspectable& sender, const winrt::SizeChangedEventArgs& args); + void OnNavigationViewItemOnGotFocus(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& e); + void OnNavigationViewItemExpandedPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args); void OnOverflowItemSelectionChanged(const winrt::IInspectable& sender, const winrt::SelectionChangedEventArgs& args); void RaiseSelectionChangedEvent(winrt::IInspectable const& nextItem, bool isSettingsItem, NavigationRecommendedTransitionDirection recommendedDirection = NavigationRecommendedTransitionDirection::Default); - void ChangeSelection(const winrt::IInspectable& prevItem, const winrt::IInspectable& nextItem); void OnTitleBarMetricsChanged(const winrt::IInspectable& sender, const winrt::IInspectable& args); void OnTitleBarIsVisibleChanged(const winrt::CoreApplicationViewTitleBar& sender, const winrt::IInspectable& args); void UpdateTitleBarPadding(); void RaiseDisplayModeChanged(const winrt::NavigationViewDisplayMode& displayMode); - void AnimateSelectionChanged(const winrt::IInspectable& lastItem, const winrt::IInspectable& currentItem); + void AnimateSelectionChanged(const winrt::IInspectable& currentItem); void AnimateSelectionChangedToItem(const winrt::IInspectable& selectedItem); void PlayIndicatorAnimations(const winrt::UIElement& indicator, float yFrom, float yTo, winrt::Size beginSize, winrt::Size endSize, bool isOutgoing); + void PlayIndicatorNonSameLevelAnimations(const winrt::UIElement& indicator, bool isOutgoing, bool fromTop); + void PlayIndicatorNonSameLevelTopPrimaryAnimation(const winrt::UIElement& indicator, bool isOutgoing); void OnAnimationComplete(const winrt::IInspectable& sender, const winrt::CompositionBatchCompletedEventArgs& args); void ResetElementAnimationProperties(const winrt::UIElement& element, float desiredOpacity); winrt::NavigationViewItem NavigationViewItemOrSettingsContentFromData(const winrt::IInspectable& data); winrt::NavigationViewItemBase NavigationViewItemBaseOrSettingsContentFromData(const winrt::IInspectable& data); - void RepeaterElementPrepared(const winrt::ItemsRepeater& ir, const winrt::ItemsRepeaterElementPreparedEventArgs& args); - void RepeaterElementClearing(const winrt::ItemsRepeater& ir, const winrt::ItemsRepeaterElementClearingEventArgs& args); - void RepeaterGettingFocus(const winrt::IInspectable& sender, const winrt::GettingFocusEventArgs& args); - - void OnNavigationViewItemIsSelectedPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args); - void OnSelectionModelSelectionChanged(const winrt::SelectionModel& selectionModel, const winrt::SelectionModelSelectionChangedEventArgs& e); - // Cache these objects for the view as they are expensive to query via GetForCurrentView() calls. winrt::ViewManagement::ApplicationView m_applicationView{ nullptr }; winrt::ViewManagement::UIViewSettings m_uiViewSettings{ nullptr }; @@ -250,23 +311,18 @@ class NavigationView : bool ShouldShowBackOrCloseButton(); void UnhookEventsAndClearFields(bool isFromDestructor = false); - - bool IsSelectionSuppressed(const winrt::IInspectable& item); bool ShouldPreserveNavigationViewRS4Behavior(); bool ShouldPreserveNavigationViewRS3Behavior(); bool NeedRearrangeOfTopElementsAfterOverflowSelectionChanged(int selectedOriginalIndex); bool ShouldShowFocusVisual(); - int GetIndexFromItem(const winrt::ItemsRepeater& ir, const winrt::IInspectable& data); - static winrt::IInspectable GetItemFromIndex(const winrt::ItemsRepeater& ir, int index); - winrt::NavigationViewItemBase GetContainerForIndexPath(const winrt::IndexPath& indexPath); - bool IsContainerTheSelectedItemInTheSelectionModel(const winrt::NavigationViewItemBase& nvib); - bool IsContainerInOverflow(const winrt::NavigationViewItemBase& nvib); void KeyboardFocusFirstItemFromItem(const winrt::NavigationViewItemBase& nvib); void KeyboardFocusLastItemFromItem(const winrt::NavigationViewItemBase& nvib); void ApplyCustomMenuItemContainerStyling(const winrt::NavigationViewItemBase& nvib, const winrt::ItemsRepeater& ir, int index); + com_ptr m_navigationViewItemsFactory{ nullptr }; + // Visual components tracker_ref m_paneToggleButton{ this }; tracker_ref m_rootSplitView{ this }; @@ -284,8 +340,11 @@ class NavigationView : tracker_ref m_topNavGrid{ this }; tracker_ref m_topNavContentOverlayAreaGrid{ this }; + // Indicator animations tracker_ref m_prevIndicator{ this }; tracker_ref m_nextIndicator{ this }; + tracker_ref m_activeIndicator{ this }; + tracker_ref m_lastSelectedItemPendingAnimationInTopNav{ this }; tracker_ref m_togglePaneTopPadding{ this }; tracker_ref m_contentPaneTopPadding{ this }; @@ -310,9 +369,7 @@ class NavigationView : tracker_ref m_paneHeaderToggleButtonColumn{ this }; tracker_ref m_paneHeaderContentBorderRow{ this }; - int m_indexOfLastSelectedItemInTopNav{ 0 }; - tracker_ref m_lastSelectedItemPendingAnimationInTopNav{ this }; - std::vector m_itemsRemovedFromMenuFlyout{}; + tracker_ref m_lastItemExpandedIntoFlyout{ this }; // Event Tokens winrt::Button::Click_revoker m_paneToggleButtonClickRevoker{}; @@ -348,6 +405,9 @@ class NavigationView : winrt::ItemsRepeater::ElementClearing_revoker m_topNavOverflowItemsRepeaterElementClearingRevoker{}; winrt::SelectionModel::SelectionChanged_revoker m_selectionChangedRevoker{}; + winrt::SelectionModel::ChildrenRequested_revoker m_childrenRequestedRevoker{}; + + winrt::FlyoutBase::Closing_revoker m_flyoutClosingRevoker{}; bool m_wasForceClosed{ false }; bool m_isClosedCompact{ false }; @@ -357,7 +417,6 @@ class NavigationView : TopNavigationViewDataProvider m_topDataProvider{ this }; winrt::SelectionModel m_selectionModel{}; - com_ptr m_navigationViewItemsFactory{ nullptr }; bool m_appliedTemplate{ false }; @@ -383,5 +442,7 @@ class NavigationView : bool m_isOpenPaneForInteraction{ false }; int32_t m_indexOfLastFocusedItem{ -1 }; + + bool m_moveTopNavOverflowItemOnFlyoutClose{ false }; }; diff --git a/dev/NavigationView/NavigationView.idl b/dev/NavigationView/NavigationView.idl index 59bb84166c..7b755bedfe 100644 --- a/dev/NavigationView/NavigationView.idl +++ b/dev/NavigationView/NavigationView.idl @@ -111,6 +111,20 @@ runtimeclass NavigationViewBackRequestedEventArgs { } +[WUXC_VERSION_PREVIEW] +[webhosthidden] +runtimeclass NavigationViewExpandingEventArgs +{ + NavigationViewItemBase ExpandingItemContainer { get; }; +} + +[WUXC_VERSION_PREVIEW] +[webhosthidden] +runtimeclass NavigationViewCollapsedEventArgs +{ + NavigationViewItemBase CollapsedItemContainer { get; }; +} + [WUXC_VERSION_RS5] [webhosthidden] unsealed runtimeclass NavigationViewTemplateSettings : Windows.UI.Xaml.DependencyObject @@ -270,6 +284,15 @@ unsealed runtimeclass NavigationView : Windows.UI.Xaml.Controls.ContentControl Boolean IsTitleBarAutoPaddingEnabled { get; set; }; static Windows.UI.Xaml.DependencyProperty IsTitleBarAutoPaddingEnabledProperty { get; }; + + [WUXC_VERSION_PREVIEW] + { + event Windows.Foundation.TypedEventHandler Expanding; + event Windows.Foundation.TypedEventHandler Collapsed; + + void Expand(NavigationViewItem item); + void Collapse(NavigationViewItem item); + } } [WUXC_VERSION_RS3] @@ -277,8 +300,13 @@ unsealed runtimeclass NavigationView : Windows.UI.Xaml.Controls.ContentControl [WUXC_INTERFACE_NAME("INavigationViewItemBase", edf04eb1-37d1-471f-8570-3829ee5b2bc6)] [WUXC_CONSTRUCTOR_NAME("INavigationViewItemBaseFactory", eb014cef-7890-4ebb-8245-02e8510f321d)] [default_interface] -unsealed runtimeclass NavigationViewItemBase : Windows.UI.Xaml.Controls.ListViewItem +unsealed runtimeclass NavigationViewItemBase : Windows.UI.Xaml.Controls.ContentControl { + [WUXC_VERSION_PREVIEW] + { + Boolean IsSelected{ get; set; }; + static Windows.UI.Xaml.DependencyProperty IsSelectedProperty { get; }; + } } [WUXC_VERSION_RS3] @@ -305,6 +333,28 @@ unsealed runtimeclass NavigationViewItem : NavigationViewItemBase static Windows.UI.Xaml.DependencyProperty SelectsOnInvokedProperty { get; }; } + + [WUXC_VERSION_PREVIEW] + { + [MUX_DEFAULT_VALUE("false")] + Boolean IsExpanded{ get; set; }; + [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)] + [MUX_DEFAULT_VALUE("false")] + Boolean HasUnrealizedChildren{ get; set; }; + [MUX_DEFAULT_VALUE("false")] + Boolean IsChildSelected{ get; set; }; + + [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)] + Windows.Foundation.Collections.IVector MenuItems{ get; }; + [MUX_PROPERTY_CHANGED_CALLBACK(TRUE)] + Object MenuItemsSource{ get; set; }; + + static Windows.UI.Xaml.DependencyProperty IsExpandedProperty{ get; }; + static Windows.UI.Xaml.DependencyProperty HasUnrealizedChildrenProperty{ get; }; + static Windows.UI.Xaml.DependencyProperty IsChildSelectedProperty{ get; }; + static Windows.UI.Xaml.DependencyProperty MenuItemsProperty{ get; }; + static Windows.UI.Xaml.DependencyProperty MenuItemsSourceProperty{ get; }; + } } [WUXC_VERSION_RS3] diff --git a/dev/NavigationView/NavigationView.vcxitems b/dev/NavigationView/NavigationView.vcxitems index 21bc2967b1..7a7dfb3cdc 100644 --- a/dev/NavigationView/NavigationView.vcxitems +++ b/dev/NavigationView/NavigationView.vcxitems @@ -18,9 +18,12 @@ + + + @@ -39,6 +42,8 @@ + + diff --git a/dev/NavigationView/NavigationView.xaml b/dev/NavigationView/NavigationView.xaml index 1659ca3e09..870a9d0ef3 100644 --- a/dev/NavigationView/NavigationView.xaml +++ b/dev/NavigationView/NavigationView.xaml @@ -6,6 +6,7 @@ xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives" xmlns:local="using:Microsoft.UI.Xaml.Controls" 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)" xmlns:primitiveContract7Present="using:Microsoft.UI.Xaml.Controls.Primitives?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"> + + + + + + + @@ -593,7 +634,7 @@ - + @@ -671,7 +712,7 @@ - + diff --git a/dev/NavigationView/NavigationViewCollapsedEventArgs.cpp b/dev/NavigationView/NavigationViewCollapsedEventArgs.cpp new file mode 100644 index 0000000000..4b335eeb67 --- /dev/null +++ b/dev/NavigationView/NavigationViewCollapsedEventArgs.cpp @@ -0,0 +1,16 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +#include "pch.h" +#include "common.h" +#include "NavigationViewCollapsedEventArgs.h" + +winrt::NavigationViewItemBase NavigationViewCollapsedEventArgs::CollapsedItemContainer() +{ + return m_collapsedItemContainer.get(); +} + +void NavigationViewCollapsedEventArgs::CollapsedItemContainer(winrt::NavigationViewItemBase const& value) +{ + m_collapsedItemContainer.set(value); +} diff --git a/dev/NavigationView/NavigationViewCollapsedEventArgs.h b/dev/NavigationView/NavigationViewCollapsedEventArgs.h new file mode 100644 index 0000000000..ed31418e64 --- /dev/null +++ b/dev/NavigationView/NavigationViewCollapsedEventArgs.h @@ -0,0 +1,18 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +#pragma once + +#include "NavigationViewCollapsedEventArgs.g.h" +#include "NavigationViewItemBase.h" + +class NavigationViewCollapsedEventArgs : + public ReferenceTracker +{ +public: + winrt::NavigationViewItemBase CollapsedItemContainer(); + void CollapsedItemContainer(winrt::NavigationViewItemBase const& value); + +private: + tracker_ref m_collapsedItemContainer{ this }; +}; diff --git a/dev/NavigationView/NavigationViewExpandingEventArgs.cpp b/dev/NavigationView/NavigationViewExpandingEventArgs.cpp new file mode 100644 index 0000000000..14f62910ea --- /dev/null +++ b/dev/NavigationView/NavigationViewExpandingEventArgs.cpp @@ -0,0 +1,16 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +#include "pch.h" +#include "common.h" +#include "NavigationViewExpandingEventArgs.h" + +winrt::NavigationViewItemBase NavigationViewExpandingEventArgs::ExpandingItemContainer() +{ + return m_expandingItemContainer.get(); +} + +void NavigationViewExpandingEventArgs::ExpandingItemContainer(winrt::NavigationViewItemBase const& value) +{ + m_expandingItemContainer.set(value); +} diff --git a/dev/NavigationView/NavigationViewExpandingEventArgs.h b/dev/NavigationView/NavigationViewExpandingEventArgs.h new file mode 100644 index 0000000000..afa28b62e4 --- /dev/null +++ b/dev/NavigationView/NavigationViewExpandingEventArgs.h @@ -0,0 +1,17 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +#pragma once + +#include "NavigationViewExpandingEventArgs.g.h" + +class NavigationViewExpandingEventArgs : + public ReferenceTracker +{ +public: + winrt::NavigationViewItemBase ExpandingItemContainer(); + void ExpandingItemContainer(winrt::NavigationViewItemBase const& value); + +private: + tracker_ref m_expandingItemContainer{ this }; +}; diff --git a/dev/NavigationView/NavigationViewItem.cpp b/dev/NavigationView/NavigationViewItem.cpp index 7a05763c42..26d05f7400 100644 --- a/dev/NavigationView/NavigationViewItem.cpp +++ b/dev/NavigationView/NavigationViewItem.cpp @@ -10,6 +10,22 @@ #include "Utils.h" static constexpr wstring_view c_navigationViewItemPresenterName = L"NavigationViewItemPresenter"sv; +static constexpr auto c_repeater = L"NavigationViewItemMenuItemsHost"sv; +static constexpr auto c_rootGrid = L"NVIRootGrid"sv; +static constexpr auto c_flyoutContentGrid = L"FlyoutContentGrid"sv; + +// Visual States +static constexpr auto c_pressedSelected = L"PressedSelected"sv; +static constexpr auto c_pointerOverSelected = L"PointerOverSelected"sv; +static constexpr auto c_selected = L"Selected"sv; +static constexpr auto c_pressed = L"Pressed"sv; +static constexpr auto c_pointerOver = L"PointerOver"sv; +static constexpr auto c_disabled = L"Disabled"sv; +static constexpr auto c_enabled = L"Enabled"sv; +static constexpr auto c_normal = L"Normal"sv; +static constexpr auto c_chevronHidden = L"ChevronHidden"sv; +static constexpr auto c_chevronVisible = L"ChevronVisible"sv; + void NavigationViewItem::UpdateVisualStateNoTransition() { @@ -19,11 +35,19 @@ void NavigationViewItem::UpdateVisualStateNoTransition() void NavigationViewItem::OnNavigationViewRepeaterPositionChanged() { UpdateVisualStateNoTransition(); + ReparentRepeater(); +} + +void NavigationViewItem::OnNavigationViewItemBaseDepthChanged() +{ + UpdateItemIndentation(); + PropagateDepthToChildren(Depth() + 1); } NavigationViewItem::NavigationViewItem() { SetDefaultStyleKey(this); + SetValue(s_MenuItemsProperty, winrt::make>()); } void NavigationViewItem::OnApplyTemplate() @@ -37,7 +61,29 @@ void NavigationViewItem::OnApplyTemplate() // Retrieve pointers to stable controls winrt::IControlProtected controlProtected = *this; m_helper.Init(controlProtected); - m_navigationViewItemPresenter.set(GetTemplateChildT(c_navigationViewItemPresenterName, controlProtected)); + + if (auto rootGrid = GetTemplateChildT(c_rootGrid, controlProtected)) + { + m_rootGrid.set(rootGrid); + + if (auto flyoutBase = winrt::FlyoutBase::GetAttachedFlyout(rootGrid)) + { + m_flyoutClosingRevoker = flyoutBase.Closing(winrt::auto_revoke, { this, &NavigationViewItem::OnFlyoutClosing }); + } + + } + + if (auto presenter = GetTemplateChildT(c_navigationViewItemPresenterName, controlProtected)) + { + m_navigationViewItemPresenter.set(presenter); + + m_presenterPointerPressedRevoker = presenter.PointerPressed(winrt::auto_revoke, { this, &NavigationViewItem::OnPresenterPointerPressed }); + m_presenterPointerReleasedRevoker = presenter.PointerReleased(winrt::auto_revoke, { this, &NavigationViewItem::OnPresenterPointerReleased }); + m_presenterPointerEnteredRevoker = presenter.PointerEntered(winrt::auto_revoke, { this, &NavigationViewItem::OnPresenterPointerEntered }); + m_presenterPointerExitedRevoker = presenter.PointerExited(winrt::auto_revoke, { this, &NavigationViewItem::OnPresenterPointerExited }); + m_presenterPointerCanceledRevoker = presenter.PointerCanceled(winrt::auto_revoke, { this, &NavigationViewItem::OnPresenterPointerCanceled }); + m_presenterPointerCaptureLostRevoker = presenter.PointerCaptureLost(winrt::auto_revoke, { this, &NavigationViewItem::OnPresenterPointerCaptureLost }); + } m_toolTip.set(GetTemplateChildT(L"ToolTip"sv, controlProtected)); @@ -54,16 +100,52 @@ void NavigationViewItem::OnApplyTemplate() UpdateIsClosedCompact(); } + // Retrieve reference to NavigationView + if (auto nvImpl = winrt::get_self(GetNavigationView())) + { + if (auto repeater = GetTemplateChildT(c_repeater, controlProtected)) + { + m_repeater.set(repeater); + + // Primary element setup happens in NavigationView + m_repeaterElementPreparedRevoker = repeater.ElementPrepared(winrt::auto_revoke, { nvImpl, &NavigationView::OnRepeaterElementPrepared }); + m_repeaterElementClearingRevoker = repeater.ElementClearing(winrt::auto_revoke, { nvImpl, &NavigationView::OnRepeaterElementClearing }); + + repeater.ItemTemplate(*(nvImpl->GetNavigationViewItemsFactory())); + } + + UpdateRepeaterItemsSource(); + } + + m_flyoutContentGrid.set(GetTemplateChildT(c_flyoutContentGrid, controlProtected)); + m_appliedTemplate = true; + UpdateItemIndentation(); UpdateVisualStateNoTransition(); auto visual = winrt::ElementCompositionPreview::GetElementVisual(*this); NavigationView::CreateAndAttachHeaderAnimation(visual); } +void NavigationViewItem::UpdateRepeaterItemsSource() +{ + if (auto repeater = m_repeater.get()) + { + auto const itemsSource = [this]() + { + if (auto const menuItemsSource = MenuItemsSource()) + { + return menuItemsSource; + } + return MenuItems().as(); + }(); + repeater.ItemsSource(itemsSource); + } +} + winrt::UIElement NavigationViewItem::GetSelectionIndicator() { - auto selectIndicator = m_helper.GetSelectionIndicator(); + auto selectIndicator = m_helper.GetSelectionIndicator(); if (auto presenter = GetPresenter()) { selectIndicator = presenter->GetSelectionIndicator(); @@ -81,6 +163,7 @@ void NavigationViewItem::OnSplitViewPropertyChanged(const winrt::DependencyObjec args == winrt::SplitView::DisplayModeProperty()) { UpdateIsClosedCompact(); + ReparentRepeater(); } } @@ -151,10 +234,55 @@ void NavigationViewItem::OnIconPropertyChanged(const winrt::DependencyPropertyCh UpdateVisualStateNoTransition(); } +void NavigationViewItem::OnMenuItemsPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args) +{ + UpdateRepeaterItemsSource(); + UpdateVisualStateForChevron(); +} + +void NavigationViewItem::OnMenuItemsSourcePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args) +{ + UpdateRepeaterItemsSource(); + UpdateVisualStateForChevron(); +} + +void NavigationViewItem::OnHasUnrealizedChildrenPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args) +{ + UpdateVisualStateForChevron(); +} + +bool NavigationViewItem::ShowSelectionIndicatorIfRequired() +{ + if (!IsSelected()) + { + if (!IsRepeaterVisible() && IsChildSelected()) + { + ShowSelectionIndicator(true); + return true; + } + else + { + ShowSelectionIndicator(false); + } + } + return false; +} + +void NavigationViewItem::ShowSelectionIndicator(bool visible) +{ + if (auto const selectionIndicator = GetSelectionIndicator()) + { + selectionIndicator.Opacity(visible ? 1.0 : 0.0); + } +} + void NavigationViewItem::UpdateVisualStateForIconAndContent(bool showIcon, bool showContent) { - auto stateName = showIcon ? (showContent ? L"IconOnLeft": L"IconOnly") : L"ContentOnly"; - winrt::VisualStateManager::GoToState(*this, stateName, false /*useTransitions*/); + if (auto const presenter = m_navigationViewItemPresenter.get()) + { + auto stateName = showIcon ? (showContent ? L"IconOnLeft" : L"IconOnly") : L"ContentOnly"; + winrt::VisualStateManager::GoToState(presenter, stateName, false /*useTransitions*/); + } } void NavigationViewItem::UpdateVisualStateForNavigationViewPositionChange() @@ -234,11 +362,77 @@ void NavigationViewItem::UpdateVisualStateForToolTip() } } +void NavigationViewItem::UpdateVisualStateForPointer() +{ + // DisabledStates and CommonStates + auto enabledStateValue = c_enabled; + bool isSelected = IsSelected(); + auto selectedStateValue = c_normal; + if (IsEnabled()) + { + if (isSelected) + { + if (m_isPressed) + { + selectedStateValue = c_pressedSelected; + } + else if (m_isPointerOver) + { + selectedStateValue = c_pointerOverSelected; + } + else + { + selectedStateValue = c_selected; + } + } + else if (m_isPointerOver) + { + if (m_isPressed) + { + selectedStateValue = c_pressed; + } + else + { + selectedStateValue = c_pointerOver; + } + } + else if (m_isPressed) + { + selectedStateValue = c_pressed; + } + } + else + { + enabledStateValue = c_disabled; + if (isSelected) + { + selectedStateValue = c_selected; + } + } + + // There are scenarios where the presenter may not exist. + // For example, the top nav settings item. In that case, + // update the states for the item itself. + if (auto const presenter = m_navigationViewItemPresenter.get()) + { + winrt::VisualStateManager::GoToState(m_navigationViewItemPresenter.get(), enabledStateValue, true); + winrt::VisualStateManager::GoToState(m_navigationViewItemPresenter.get(), selectedStateValue, true); + } + else + { + winrt::VisualStateManager::GoToState(*this, enabledStateValue, true); + winrt::VisualStateManager::GoToState(*this, selectedStateValue, true); + } + +} + void NavigationViewItem::UpdateVisualState(bool useTransitions) { if (!m_appliedTemplate) return; + UpdateVisualStateForPointer(); + UpdateVisualStateForNavigationViewPositionChange(); bool shouldShowIcon = ShouldShowIcon(); @@ -246,10 +440,11 @@ void NavigationViewItem::UpdateVisualState(bool useTransitions) if (IsOnLeftNav()) { - winrt::VisualStateManager::GoToState(*this, m_isClosedCompact ? L"ClosedCompact" : L"NotClosedCompact", useTransitions); - - // Backward Compatibility with RS4-, new implementation prefer IconOnLeft/IconOnly/ContentOnly - winrt::VisualStateManager::GoToState(*this, shouldShowIcon ? L"IconVisible" : L"IconCollapsed", useTransitions); + if (auto const presenter = m_navigationViewItemPresenter.get()) + { + // Backward Compatibility with RS4-, new implementation prefer IconOnLeft/IconOnly/ContentOnly + winrt::VisualStateManager::GoToState(m_navigationViewItemPresenter.get(), shouldShowIcon ? L"IconVisible" : L"IconCollapsed", useTransitions); + } } UpdateVisualStateForToolTip(); @@ -258,6 +453,22 @@ void NavigationViewItem::UpdateVisualState(bool useTransitions) // visual state for focus state. top navigation use it to provide different visual for selected and selected+focused UpdateVisualStateForKeyboardFocusedState(); + + UpdateVisualStateForChevron(); +} + +void NavigationViewItem::UpdateVisualStateForChevron() +{ + if (auto const presenter = m_navigationViewItemPresenter.get()) + { + auto const chevronState = HasChildren() && !(m_isClosedCompact && ShouldRepeaterShowInFlyout()) ? c_chevronVisible : c_chevronHidden; + winrt::VisualStateManager::GoToState(m_navigationViewItemPresenter.get(), chevronState, true); + } +} + +bool NavigationViewItem::HasChildren() +{ + return MenuItems().Size() > 0 || MenuItemsSource() != nullptr || HasUnrealizedChildren(); } bool NavigationViewItem::ShouldShowIcon() @@ -296,6 +507,110 @@ NavigationViewItemPresenter * NavigationViewItem::GetPresenter() return presenter; } +void NavigationViewItem::ShowChildren(bool shouldShowChildren) +{ + auto visibility = shouldShowChildren ? winrt::Visibility::Visible : winrt::Visibility::Collapsed; + m_repeater.get().Visibility(visibility); + + if (ShouldRepeaterShowInFlyout()) + { + if (shouldShowChildren) + { + // There seems to be a race condition happening which sometimes + // prevents the opening of the flyout. Queue callback as a workaround. + SharedHelpers::QueueCallbackForCompositionRendering( + [strongThis = get_strong()]() + { + winrt::FlyoutBase::ShowAttachedFlyout(strongThis->m_rootGrid.get()); + }); + } + else + { + if (auto const flyout = winrt::FlyoutBase::GetAttachedFlyout(m_rootGrid.get())) + { + flyout.Hide(); + } + } + } +} + +void NavigationViewItem::ReparentRepeater() +{ + if (HasChildren()) + { + if (auto const repeater = m_repeater.get()) + { + if (ShouldRepeaterShowInFlyout() && !m_isRepeaterParentedToFlyout) + { + // Reparent repeater to flyout + // TODO: Replace removeatend with something more specific + m_rootGrid.get().Children().RemoveAtEnd(); + m_flyoutContentGrid.get().Children().Append(repeater); + m_isRepeaterParentedToFlyout = true; + + PropagateDepthToChildren(0); + } + else if (!ShouldRepeaterShowInFlyout() && m_isRepeaterParentedToFlyout) + { + m_flyoutContentGrid.get().Children().RemoveAtEnd(); + m_rootGrid.get().Children().Append(repeater); + m_isRepeaterParentedToFlyout = false; + + PropagateDepthToChildren(1); + } + } + } +} + +bool NavigationViewItem::ShouldRepeaterShowInFlyout() +{ + return (m_isClosedCompact && IsTopLevelItem()) || IsOnTopPrimary(); +} + +bool NavigationViewItem::IsRepeaterVisible() +{ + return m_repeater.get().Visibility() == winrt::Visibility::Visible; +} + +void NavigationViewItem::UpdateItemIndentation() +{ + // Update item indentation based on its depth + if (auto const presenter = m_navigationViewItemPresenter.get()) + { + auto newLeftMargin = Depth() * c_itemIndentation; + winrt::get_self(presenter)->UpdateContentLeftIndentation(static_cast(newLeftMargin)); + } +} + +void NavigationViewItem::PropagateDepthToChildren(int depth) +{ + if (auto const repeater = m_repeater.get()) + { + auto itemsCount = repeater.ItemsSourceView().Count(); + for (int index = 0; index < itemsCount; index++) + { + if (auto const element = repeater.TryGetElement(index)) + { + if (auto const nvib = element.try_as()) + { + winrt::get_self(nvib)->Depth(depth); + } + } + } + } +} + +void NavigationViewItem::OnExpandCollapseChevronTapped(const winrt::IInspectable& sender, const winrt::TappedRoutedEventArgs& args) +{ + IsExpanded(!IsExpanded()); + args.Handled(true); +} + +void NavigationViewItem::OnFlyoutClosing(const winrt::IInspectable& sender, const winrt::FlyoutBaseClosingEventArgs& args) +{ + IsExpanded(false); +} + // IUIElement / IUIElementOverridesHelper winrt::AutomationPeer NavigationViewItem::OnCreateAutomationPeer() { @@ -346,3 +661,49 @@ void NavigationViewItem::OnLostFocus(winrt::RoutedEventArgs const& e) UpdateVisualStateNoTransition(); } } + +void NavigationViewItem::OnPresenterPointerPressed(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args) +{ + // TODO: Update to look at presenter instead + auto pointerProperties = args.GetCurrentPoint(*this).Properties(); + m_isPressed = pointerProperties.IsLeftButtonPressed() || pointerProperties.IsRightButtonPressed(); + + UpdateVisualState(true); +} + +void NavigationViewItem::OnPresenterPointerReleased(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args) +{ + m_isPressed = false; + UpdateVisualState(true); +} + +void NavigationViewItem::OnPresenterPointerEntered(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args) +{ + m_isPointerOver = true; + UpdateVisualState(true); +} + +void NavigationViewItem::OnPresenterPointerExited(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args) +{ + m_isPointerOver = false; + UpdateVisualState(true); +} + +void NavigationViewItem::OnPresenterPointerCanceled(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args) +{ + m_isPressed = false; + m_isPointerOver = false; + UpdateVisualState(true); +} + +void NavigationViewItem::OnPresenterPointerCaptureLost(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args) +{ + m_isPressed = false; + m_isPointerOver = false; + UpdateVisualState(true); +} + +void NavigationViewItem::RotateExpandCollapseChevron(bool isExpanded) +{ + winrt::get_self(m_navigationViewItemPresenter.get())->RotateExpandCollapseChevron(isExpanded); +} diff --git a/dev/NavigationView/NavigationViewItem.h b/dev/NavigationView/NavigationViewItem.h index 054e0ac067..0f72caa926 100644 --- a/dev/NavigationView/NavigationViewItem.h +++ b/dev/NavigationView/NavigationViewItem.h @@ -19,10 +19,18 @@ class NavigationViewItem : NavigationViewItem(); + // These functions are ambiguous with NavigationViewItemBase, disambiguate + using NavigationViewItemProperties::EnsureProperties; + using NavigationViewItemProperties::ClearProperties; + // IFrameworkElementOverrides void OnApplyTemplate() override; + // Property change callbacks void OnIconPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args); + void OnMenuItemsPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args); + void OnMenuItemsSourcePropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args); + void OnHasUnrealizedChildrenPropertyChanged(const winrt::DependencyPropertyChangedEventArgs& args); winrt::UIElement GetSelectionIndicator(); winrt::ToolTip GetToolTip(); @@ -42,10 +50,31 @@ class NavigationViewItem : // It provides a chance for NavigationViewItemPresenter to request visualstate refresh void UpdateVisualStateNoTransition(); + void OnPresenterPointerPressed(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args); + void OnPresenterPointerReleased(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args); + void OnPresenterPointerEntered(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args); + void OnPresenterPointerExited(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args); + void OnPresenterPointerCanceled(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args); + void OnPresenterPointerCaptureLost(const winrt::IInspectable& sender, const winrt::PointerRoutedEventArgs& args); + + void ShowChildren(bool shouldShowChildren); + bool ShouldRepeaterShowInFlyout(); + + winrt::ItemsRepeater GetRepeater() { return m_repeater.get(); }; + + NavigationViewItemPresenter* GetPresenter(); + + void OnExpandCollapseChevronTapped(const winrt::IInspectable& sender, const winrt::TappedRoutedEventArgs& args); + bool ShowSelectionIndicatorIfRequired(); + void RotateExpandCollapseChevron(bool isExpanded); + bool IsRepeaterVisible(); + void PropagateDepthToChildren(int depth); + private: void UpdateNavigationViewItemToolTip(); void SuggestedToolTipChanged(winrt::IInspectable const& newContent); void OnNavigationViewRepeaterPositionChanged() override; + void OnNavigationViewItemBaseDepthChanged() override; void OnLoaded(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& args); void OnUnloaded(const winrt::IInspectable& sender, const winrt::RoutedEventArgs& args); @@ -58,6 +87,8 @@ class NavigationViewItem : void UpdateVisualStateForNavigationViewPositionChange(); void UpdateVisualStateForKeyboardFocusedState(); void UpdateVisualStateForToolTip(); + void UpdateVisualStateForPointer(); + void UpdateVisualStateForChevron(); void UpdateVisualState(bool useTransitions); bool ShouldShowIcon(); @@ -65,20 +96,47 @@ class NavigationViewItem : bool ShouldEnableToolTip(); bool IsOnLeftNav(); bool IsOnTopPrimary(); - - NavigationViewItemPresenter * GetPresenter(); + bool HasChildren(); + + void UpdateRepeaterItemsSource(); + void ReparentRepeater(); + void ReparentContent(); + void OnFlyoutClosing(const winrt::IInspectable& sender, const winrt::FlyoutBaseClosingEventArgs& args); + void UpdateItemIndentation(); + void ShowSelectionIndicator(bool visible); PropertyChanged_revoker m_splitViewIsPaneOpenChangedRevoker{}; PropertyChanged_revoker m_splitViewDisplayModeChangedRevoker{}; PropertyChanged_revoker m_splitViewCompactPaneLengthChangedRevoker{}; + winrt::UIElement::PointerPressed_revoker m_presenterPointerPressedRevoker{}; + winrt::UIElement::PointerReleased_revoker m_presenterPointerReleasedRevoker{}; + winrt::UIElement::PointerEntered_revoker m_presenterPointerEnteredRevoker{}; + winrt::UIElement::PointerExited_revoker m_presenterPointerExitedRevoker{}; + winrt::UIElement::PointerCanceled_revoker m_presenterPointerCanceledRevoker{}; + winrt::UIElement::PointerCaptureLost_revoker m_presenterPointerCaptureLostRevoker{}; + + winrt::ItemsRepeater::ElementPrepared_revoker m_repeaterElementPreparedRevoker{}; + winrt::ItemsRepeater::ElementClearing_revoker m_repeaterElementClearingRevoker{}; + + winrt::FlyoutBase::Closing_revoker m_flyoutClosingRevoker{}; + tracker_ref m_toolTip{ this }; NavigationViewItemHelper m_helper{ this }; tracker_ref m_navigationViewItemPresenter{ this }; tracker_ref m_suggestedToolTipContent{ this }; + tracker_ref m_repeater{ this }; + tracker_ref m_flyoutContentGrid{ this }; + tracker_ref m_rootGrid{ this }; bool m_isClosedCompact{ false }; bool m_appliedTemplate{ false }; bool m_hasKeyboardFocus{ false }; + + // Visual state tracking + bool m_isPressed{ false }; + bool m_isPointerOver{ false }; + + bool m_isRepeaterParentedToFlyout{ false }; }; diff --git a/dev/NavigationView/NavigationViewItemAutomationPeer.cpp b/dev/NavigationView/NavigationViewItemAutomationPeer.cpp index 2030ab5181..57b26787fc 100644 --- a/dev/NavigationView/NavigationViewItemAutomationPeer.cpp +++ b/dev/NavigationView/NavigationViewItemAutomationPeer.cpp @@ -46,7 +46,8 @@ winrt::hstring NavigationViewItemAutomationPeer::GetNameCore() winrt::IInspectable NavigationViewItemAutomationPeer::GetPatternCore(winrt::PatternInterface const& pattern) { if (pattern == winrt::PatternInterface::SelectionItem || - pattern == winrt::PatternInterface::Invoke) + pattern == winrt::PatternInterface::Invoke || + pattern == winrt::PatternInterface::ExpandCollapse) { return *this; } @@ -54,6 +55,10 @@ winrt::IInspectable NavigationViewItemAutomationPeer::GetPatternCore(winrt::Patt return __super::GetPatternCore(pattern); } +winrt::hstring NavigationViewItemAutomationPeer::GetClassNameCore() +{ + return winrt::hstring_name_of(); +} winrt::AutomationControlType NavigationViewItemAutomationPeer::GetAutomationControlTypeCore() { @@ -65,6 +70,8 @@ winrt::AutomationControlType NavigationViewItemAutomationPeer::GetAutomationCont } else { + // TODO: Should this be ListItem in minimal mode and + // TreeItem otherwise. return winrt::AutomationControlType::ListItem; } } @@ -84,7 +91,7 @@ int32_t NavigationViewItemAutomationPeer::GetPositionInSetCore() if (auto navigationView = GetParentNavigationView()) { auto topDataProvider = winrt::get_self(navigationView)->GetTopDataProvider(); - positionInSet = GetPositionOrSetCountInTopNavHelper(IsOnTopNavigationOverflow() + positionInSet = GetPositionOrSetCountInTopNavHelper(IsOnTopNavigationOverflow() ? topDataProvider.GetOverflowItems() : topDataProvider.GetPrimaryItems(), AutomationOutput::Position); } } @@ -110,7 +117,7 @@ int32_t NavigationViewItemAutomationPeer::GetSizeOfSetCore() if (auto navview = GetParentNavigationView()) { auto topNavDataProvider = winrt::get_self(navview)->GetTopDataProvider(); - sizeOfSet = GetPositionOrSetCountInTopNavHelper(IsOnTopNavigationOverflow() + sizeOfSet = GetPositionOrSetCountInTopNavHelper(IsOnTopNavigationOverflow() ? topNavDataProvider.GetOverflowItems() : topNavDataProvider.GetPrimaryItems(), AutomationOutput::Size); } @@ -123,6 +130,17 @@ int32_t NavigationViewItemAutomationPeer::GetSizeOfSetCore() return sizeOfSet; } +int32_t NavigationViewItemAutomationPeer::GetLevelCore() +{ + int32_t level = 0; + if (winrt::NavigationViewItemBase navigationViewItem = Owner().try_as()) + { + return winrt::get_self(navigationViewItem)->Depth(); + } + + return level; +} + void NavigationViewItemAutomationPeer::Invoke() { if (auto const navView = GetParentNavigationView()) @@ -141,6 +159,61 @@ void NavigationViewItemAutomationPeer::Invoke() } } +// IExpandCollapseProvider +winrt::ExpandCollapseState NavigationViewItemAutomationPeer::ExpandCollapseState() +{ + auto state = winrt::ExpandCollapseState::LeafNode; + if (winrt::NavigationViewItem navigationViewItem = Owner().try_as()) + { + state = winrt::get_self(navigationViewItem)->IsExpanded() ? + winrt::ExpandCollapseState::Expanded : + winrt::ExpandCollapseState::Collapsed; + } + + return state; +} + +void NavigationViewItemAutomationPeer::Collapse() +{ + if (auto const navView = GetParentNavigationView()) + { + if (winrt::NavigationViewItem navigationViewItem = Owner().try_as()) + { + navView.Collapse(navigationViewItem); + RaiseExpandCollapseAutomationEvent(winrt::ExpandCollapseState::Collapsed); + } + } +} + +void NavigationViewItemAutomationPeer::Expand() +{ + if (auto const navView = GetParentNavigationView()) + { + if (winrt::NavigationViewItem navigationViewItem = Owner().try_as()) + { + navView.Expand(navigationViewItem); + RaiseExpandCollapseAutomationEvent(winrt::ExpandCollapseState::Expanded); + } + } +} + +void NavigationViewItemAutomationPeer::RaiseExpandCollapseAutomationEvent(winrt::ExpandCollapseState newState) +{ + if (winrt::AutomationPeer::ListenerExists(winrt::AutomationEvents::PropertyChanged)) + { + winrt::ExpandCollapseState oldState = (newState == winrt::ExpandCollapseState::Expanded) ? + winrt::ExpandCollapseState::Collapsed : + winrt::ExpandCollapseState::Expanded; + + // box_value(oldState) doesn't work here, use ReferenceWithABIRuntimeClassName to make Narrator can unbox it. + RaisePropertyChangedEvent(winrt::ExpandCollapsePatternIdentifiers::ExpandCollapseStateProperty(), + box_value(oldState), + box_value(newState)); + } +} + + + winrt::NavigationView NavigationViewItemAutomationPeer::GetParentNavigationView() { winrt::NavigationView navigationView{ nullptr }; @@ -213,7 +286,7 @@ NavigationViewRepeaterPosition NavigationViewItemAutomationPeer::GetNavigationVi int32_t NavigationViewItemAutomationPeer::GetPositionOrSetCountInLeftNavHelper(AutomationOutput automationOutput) { int returnValue = 0; - + if (auto const navview = GetParentNavigationView()) { if (auto const repeater = winrt::get_self(navview)->LeftNavRepeater()) @@ -246,7 +319,7 @@ int32_t NavigationViewItemAutomationPeer::GetPositionOrSetCountInLeftNavHelper(A { returnValue++; - if (child.try_as() == static_cast(*this)) + if (winrt::FrameworkElementAutomationPeer::FromElement(navviewItem) == static_cast(*this)) { if (automationOutput == AutomationOutput::Position) { @@ -277,7 +350,7 @@ int32_t NavigationViewItemAutomationPeer::GetPositionOrSetCountInLeftNavHelper(A int32_t NavigationViewItemAutomationPeer::GetPositionOrSetCountInTopNavHelper(winrt::IVector navigationViewElements, AutomationOutput automationOutput) { int32_t returnValue = 0; - + if (auto const navview = GetParentNavigationView()) { bool itemFound = false; diff --git a/dev/NavigationView/NavigationViewItemAutomationPeer.h b/dev/NavigationView/NavigationViewItemAutomationPeer.h index b27851d8fd..34ebe260d0 100644 --- a/dev/NavigationView/NavigationViewItemAutomationPeer.h +++ b/dev/NavigationView/NavigationViewItemAutomationPeer.h @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. #pragma once @@ -20,10 +20,12 @@ class NavigationViewItemAutomationPeer : winrt::hstring GetNameCore(); winrt::IInspectable GetPatternCore(winrt::PatternInterface const& patternInterface); winrt::AutomationControlType GetAutomationControlTypeCore(); + winrt::hstring GetClassNameCore(); // IAutomationPeerOverrides3 int32_t GetPositionInSetCore(); int32_t GetSizeOfSetCore(); + int32_t GetLevelCore(); // IInvokeProvider void Invoke(); @@ -35,6 +37,12 @@ class NavigationViewItemAutomationPeer : void RemoveFromSelection(); void Select(); + // IExpandCollapseProvider + winrt::ExpandCollapseState ExpandCollapseState(); + void Collapse(); + void Expand(); + void RaiseExpandCollapseAutomationEvent(winrt::ExpandCollapseState newState); + private: enum class AutomationOutput diff --git a/dev/NavigationView/NavigationViewItemAutomationPeer.idl b/dev/NavigationView/NavigationViewItemAutomationPeer.idl index 473a8a6d95..60c37b7b49 100644 --- a/dev/NavigationView/NavigationViewItemAutomationPeer.idl +++ b/dev/NavigationView/NavigationViewItemAutomationPeer.idl @@ -5,7 +5,7 @@ [webhosthidden] [WUXC_INTERFACE_NAME("INavigationViewItemAutomationPeer", 309847a5-9971-4d8d-a81c-085c7086a1b9)] [WUXC_CONSTRUCTOR_NAME("INavigationViewItemAutomationPeerFactory", 0bc2835d-aa38-4f97-9664-e6fc821d81ed)] -unsealed runtimeclass NavigationViewItemAutomationPeer : Windows.UI.Xaml.Automation.Peers.ListViewItemAutomationPeer +unsealed runtimeclass NavigationViewItemAutomationPeer : Windows.UI.Xaml.Automation.Peers.FrameworkElementAutomationPeer, Windows.UI.Xaml.Automation.Provider.IExpandCollapseProvider { [method_name("CreateInstanceWithOwner")] NavigationViewItemAutomationPeer(MU_XC_NAMESPACE.NavigationViewItem owner); } diff --git a/dev/NavigationView/NavigationViewItemBase.cpp b/dev/NavigationView/NavigationViewItemBase.cpp index ee16f349e7..d28e719b35 100644 --- a/dev/NavigationView/NavigationViewItemBase.cpp +++ b/dev/NavigationView/NavigationViewItemBase.cpp @@ -26,6 +26,17 @@ winrt::NavigationView NavigationViewItemBase::GetNavigationView() return m_navigationView.get(); } +void NavigationViewItemBase::Depth(int depth) +{ + m_depth = depth; + OnNavigationViewItemBaseDepthChanged(); +} + +int NavigationViewItemBase::Depth() +{ + return m_depth; +} + winrt::SplitView NavigationViewItemBase::GetSplitView() { winrt::SplitView splitView{ nullptr }; diff --git a/dev/NavigationView/NavigationViewItemBase.h b/dev/NavigationView/NavigationViewItemBase.h index a6577390a5..478131d622 100644 --- a/dev/NavigationView/NavigationViewItemBase.h +++ b/dev/NavigationView/NavigationViewItemBase.h @@ -5,9 +5,11 @@ #include "NavigationViewItemBase.g.h" #include "NavigationViewHelper.h" +#include "NavigationViewItemBase.properties.h" class NavigationViewItemBase : - public ReferenceTracker + public ReferenceTracker, + public NavigationViewItemBaseProperties { public: @@ -41,18 +43,31 @@ class NavigationViewItemBase : __super::OnLostFocus(e); } - virtual void OnNavigationViewRepeaterPositionChanged() {} - NavigationViewRepeaterPosition Position(); void Position(NavigationViewRepeaterPosition value); + virtual void OnNavigationViewRepeaterPositionChanged() {} + + void Depth(int depth); + int Depth(); + virtual void OnNavigationViewItemBaseDepthChanged() {} winrt::NavigationView GetNavigationView(); winrt::SplitView GetSplitView(); void SetNavigationViewParent(winrt::NavigationView const& navigationView); + + // TODO: Constant is a temporary mesure. Potentially expose using TemplateSettings. + static constexpr int c_itemIndentation = 25; + + void IsTopLevelItem(bool isTopLevelItem) { m_isTopLevelItem = isTopLevelItem; }; + bool IsTopLevelItem() { return m_isTopLevelItem; }; + protected: + winrt::weak_ref m_navigationView{ nullptr }; private: - NavigationViewRepeaterPosition m_position{ NavigationViewRepeaterPosition::LeftNav }; + NavigationViewRepeaterPosition m_position{ NavigationViewRepeaterPosition::LeftNav }; + int m_depth{ 0 }; + bool m_isTopLevelItem{ false }; }; diff --git a/dev/NavigationView/NavigationViewItemHeader.cpp b/dev/NavigationView/NavigationViewItemHeader.cpp index 24cb4e03be..6f3675613d 100644 --- a/dev/NavigationView/NavigationViewItemHeader.cpp +++ b/dev/NavigationView/NavigationViewItemHeader.cpp @@ -8,6 +8,8 @@ #include "NavigationViewItemHeader.properties.cpp" +static constexpr auto c_rootGrid = L"NavigationViewItemHeaderRootGrid"sv; + NavigationViewItemHeader::NavigationViewItemHeader() { SetDefaultStyleKey(this); @@ -25,7 +27,13 @@ void NavigationViewItemHeader::OnApplyTemplate() UpdateIsClosedCompact(); } + if (auto rootGrid = GetTemplateChildT(c_rootGrid, *this)) + { + m_rootGrid.set(rootGrid); + } + UpdateVisualState(false /*useTransitions*/); + UpdateItemIndentation(); auto visual = winrt::ElementCompositionPreview::GetElementVisual(*this); NavigationView::CreateAndAttachHeaderAnimation(visual); @@ -52,5 +60,21 @@ void NavigationViewItemHeader::UpdateIsClosedCompact() void NavigationViewItemHeader::UpdateVisualState(bool useTransitions) { - winrt::VisualStateManager::GoToState(*this, m_isClosedCompact ? L"HeaderTextCollapsed" : L"HeaderTextVisible", useTransitions); + winrt::VisualStateManager::GoToState(*this, m_isClosedCompact && IsTopLevelItem() ? L"HeaderTextCollapsed" : L"HeaderTextVisible", useTransitions); +} + +void NavigationViewItemHeader::OnNavigationViewItemBaseDepthChanged() +{ + UpdateItemIndentation(); +} + +void NavigationViewItemHeader::UpdateItemIndentation() +{ + // Update item indentation based on its depth + if (auto const rootGrid = m_rootGrid.get()) + { + auto const oldMargin = rootGrid.Margin(); + auto newLeftMargin = Depth() * c_itemIndentation; + rootGrid.Margin({ static_cast(newLeftMargin), oldMargin.Top, oldMargin.Right, oldMargin.Bottom }); + } } diff --git a/dev/NavigationView/NavigationViewItemHeader.h b/dev/NavigationView/NavigationViewItemHeader.h index d761294fc9..44791011b3 100644 --- a/dev/NavigationView/NavigationViewItemHeader.h +++ b/dev/NavigationView/NavigationViewItemHeader.h @@ -20,6 +20,8 @@ class NavigationViewItemHeader : private: void OnSplitViewPropertyChanged(const winrt::DependencyObject& sender, const winrt::DependencyProperty& args); void UpdateIsClosedCompact(); + void UpdateItemIndentation(); + void OnNavigationViewItemBaseDepthChanged() override; void UpdateVisualState(bool useTransitions); @@ -28,4 +30,6 @@ class NavigationViewItemHeader : PropertyChanged_revoker m_splitViewIsPaneOpenChangedRevoker{}; PropertyChanged_revoker m_splitViewDisplayModeChangedRevoker{}; + tracker_ref m_rootGrid{ this }; + }; diff --git a/dev/NavigationView/NavigationViewItemPresenter.cpp b/dev/NavigationView/NavigationViewItemPresenter.cpp index 712d6de01f..555611bed5 100644 --- a/dev/NavigationView/NavigationViewItemPresenter.cpp +++ b/dev/NavigationView/NavigationViewItemPresenter.cpp @@ -7,6 +7,11 @@ #include "NavigationViewItem.h" #include "SharedHelpers.h" +static constexpr auto c_contentGrid = L"PresenterContentRootGrid"sv; +static constexpr auto c_expandCollapseChevron = L"ExpandCollapseChevron"sv; +static constexpr auto c_expandCollapseRotateExpandedStoryboard = L"ExpandCollapseRotateExpandedStoryboard"sv; +static constexpr auto c_expandCollapseRotateCollapsedStoryboard = L"ExpandCollapseRotateCollapsedStoryboard"sv; + NavigationViewItemPresenter::NavigationViewItemPresenter() { SetDefaultStyleKey(this); @@ -16,10 +21,45 @@ void NavigationViewItemPresenter::OnApplyTemplate() { // Retrieve pointers to stable controls m_helper.Init(*this); + + if (auto contentGrid = GetTemplateChildT(c_contentGrid, *this)) + { + m_contentGrid.set(contentGrid); + } + if (auto navigationViewItem = GetNavigationViewItem()) { + if (auto const expandCollapseChevron = GetTemplateChildT(c_expandCollapseChevron, *this)) + { + m_expandCollapseChevron.set(expandCollapseChevron); + m_expandCollapseChevronTappedToken = expandCollapseChevron.Tapped({ navigationViewItem, &NavigationViewItem::OnExpandCollapseChevronTapped }); + } + navigationViewItem->UpdateVisualStateNoTransition(); } + + m_chevronExpandedStoryboard.set(GetTemplateChildT(c_expandCollapseRotateExpandedStoryboard, *this)); + m_chevronCollapsedStoryboard.set(GetTemplateChildT(c_expandCollapseRotateCollapsedStoryboard, *this)); + + UpdateMargin(); +} + +void NavigationViewItemPresenter::RotateExpandCollapseChevron(bool isExpanded) +{ + if (isExpanded) + { + if (auto const openStoryboard = m_chevronExpandedStoryboard.get()) + { + openStoryboard.Begin(); + } + } + else + { + if (auto const closedStoryboard = m_chevronCollapsedStoryboard.get()) + { + closedStoryboard.Begin(); + } + } } winrt::UIElement NavigationViewItemPresenter::GetSelectionIndicator() @@ -54,4 +94,19 @@ NavigationViewItem* NavigationViewItemPresenter::GetNavigationViewItem() navigationViewItem = winrt::get_self(item); } return navigationViewItem; -} \ No newline at end of file +} + +void NavigationViewItemPresenter::UpdateContentLeftIndentation(double leftIndentation) +{ + m_leftIndentation = leftIndentation; + UpdateMargin(); +} + +void NavigationViewItemPresenter::UpdateMargin() +{ + if (auto const grid = m_contentGrid.get()) + { + auto const oldGridMargin = grid.Margin(); + grid.Margin({ m_leftIndentation, oldGridMargin.Top, oldGridMargin.Right, oldGridMargin.Bottom }); + } +} diff --git a/dev/NavigationView/NavigationViewItemPresenter.h b/dev/NavigationView/NavigationViewItemPresenter.h index bfe422fd75..9880350cec 100644 --- a/dev/NavigationView/NavigationViewItemPresenter.h +++ b/dev/NavigationView/NavigationViewItemPresenter.h @@ -23,8 +23,22 @@ class NavigationViewItemPresenter: winrt::UIElement GetSelectionIndicator(); + void UpdateContentLeftIndentation(double leftIndentation); + + void RotateExpandCollapseChevron(bool isExpanded); + private: NavigationViewItem * GetNavigationViewItem(); + void UpdateMargin(); NavigationViewItemHelper m_helper{ this }; + tracker_ref m_contentGrid{ this }; + tracker_ref m_expandCollapseChevron{ this }; + + winrt::event_token m_expandCollapseChevronTappedToken{}; + + double m_leftIndentation{ 0 }; + + tracker_ref m_chevronExpandedStoryboard{ this }; + tracker_ref m_chevronCollapsedStoryboard{ this }; }; diff --git a/dev/NavigationView/NavigationViewItemPresenter.idl b/dev/NavigationView/NavigationViewItemPresenter.idl index be820fe062..2d5f8a5975 100644 --- a/dev/NavigationView/NavigationViewItemPresenter.idl +++ b/dev/NavigationView/NavigationViewItemPresenter.idl @@ -1,4 +1,4 @@ -namespace MU_XCP_NAMESPACE +namespace MU_XCP_NAMESPACE { [WUXC_VERSION_RS5] @@ -11,4 +11,4 @@ unsealed runtimeclass NavigationViewItemPresenter : Windows.UI.Xaml.Controls.Con static Windows.UI.Xaml.DependencyProperty IconProperty { get; }; } -} \ No newline at end of file +} diff --git a/dev/NavigationView/NavigationViewItemRevokers.h b/dev/NavigationView/NavigationViewItemRevokers.h index 9227c23e78..624cab7a61 100644 --- a/dev/NavigationView/NavigationViewItemRevokers.h +++ b/dev/NavigationView/NavigationViewItemRevokers.h @@ -11,4 +11,5 @@ class NavigationViewItemRevokers : public winrt::implements(c_rootGrid, *this)) + { + m_rootGrid.set(rootGrid); + } + m_appliedTemplate = true; UpdateVisualState(false /*useTransition*/); + UpdateItemIndentation(); } void NavigationViewItemSeparator::OnNavigationViewRepeaterPositionChanged() { UpdateVisualState(false /*useTransition*/); } + +void NavigationViewItemSeparator::OnNavigationViewItemBaseDepthChanged() +{ + UpdateItemIndentation(); +} + +void NavigationViewItemSeparator::UpdateItemIndentation() +{ + // Update item indentation based on its depth + if (auto const rootGrid = m_rootGrid.get()) + { + auto const oldMargin = rootGrid.Margin(); + auto newLeftMargin = Depth() * c_itemIndentation; + rootGrid.Margin({ static_cast(newLeftMargin), oldMargin.Top, oldMargin.Right, oldMargin.Bottom }); + } +} diff --git a/dev/NavigationView/NavigationViewItemSeparator.h b/dev/NavigationView/NavigationViewItemSeparator.h index 5f0da5f4d8..cd5a68bec2 100644 --- a/dev/NavigationView/NavigationViewItemSeparator.h +++ b/dev/NavigationView/NavigationViewItemSeparator.h @@ -17,7 +17,11 @@ class NavigationViewItemSeparator : private: void OnNavigationViewRepeaterPositionChanged() override; + void OnNavigationViewItemBaseDepthChanged() override; void UpdateVisualState(bool useTransitions); + void UpdateItemIndentation(); bool m_appliedTemplate{ false }; + + tracker_ref m_rootGrid{ this }; }; diff --git a/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs b/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs index 139280c76c..ec7437fd0d 100644 --- a/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs +++ b/dev/NavigationView/NavigationView_InteractionTests/NavigationViewTests.cs @@ -4214,6 +4214,150 @@ public void VerifyEventsReturnExpectedDataTypesMenuItemsSource() } } + [TestMethod] + [TestProperty("TestSuite", "D")] + public void VerifyExpandCollpaseFunctionality() + { + var testScenarios = RegressionTestScenario.BuildHierarchicalNavRegressionTestScenarios(); + foreach (var testScenario in testScenarios) + { + using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", testScenario.TestPageName })) + { + Log.Comment("Verify that first menu item is not expanded."); + var firstItem = FindElement.ByName("Menu Item 1"); + var childItem = FindElement.ByName("Menu Item 2"); + Verify.IsNull(childItem); + + Log.Comment("Expand first menu item."); + InputHelper.LeftClick(firstItem); + Wait.ForIdle(); + + childItem = FindElement.ByName("Menu Item 2"); + Verify.IsNotNull(childItem, "Child item should be visible after expanding parent item."); + + } + } + } + + + [TestMethod] + [TestProperty("TestSuite", "D")] + public void CanSelectNavigationViewItemWithChildren() + { + var testScenarios = RegressionTestScenario.BuildHierarchicalNavRegressionTestScenarios(); + foreach (var testScenario in testScenarios) + { + using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", testScenario.TestPageName })) + { + TextBlock displayModeTextBox = new TextBlock(FindElement.ByName("SelectedItemLabel")); + + Log.Comment("Verify that first menu item is not expanded."); + var firstItem = FindElement.ByName("Menu Item 6 (Selectable)"); + var childItem = FindElement.ByName("Menu Item 7 (Selectable)"); + Verify.IsNull(childItem); + Verify.AreEqual(displayModeTextBox.DocumentText, "uninitialized"); + + InputHelper.LeftClick(firstItem); + Wait.ForIdle(); + + var getSelectItemButton = new Button(FindElement.ByName("GetSelectedItemLabelButton")); + getSelectItemButton.Invoke(); + Wait.ForIdle(); + + childItem = FindElement.ByName("Menu Item 7 (Selectable)"); + Verify.IsNotNull(childItem, "Child item should be visible after expanding parent item."); + Verify.AreEqual(displayModeTextBox.DocumentText, "Menu Item 6 (Selectable)"); + + } + } + } + + [TestMethod] + [TestProperty("TestSuite", "D")] + public void CanSelectItemInFlyoutAndNVIGetsCollapsedOnFlyoutClose() + { + using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", "HierarchicalNavigationView Markup Test" })) + { + Log.Comment("Put NavigationView into Left Compact Mode."); + var panelDisplayModeComboBox = new ComboBox(FindElement.ByName("PaneDisplayModeCombobox")); + panelDisplayModeComboBox.SelectItemByName("LeftCompact"); + Wait.ForIdle(); + + TextBlock displayModeTextBox = new TextBlock(FindElement.ByName("SelectedItemLabel")); + Verify.AreEqual(displayModeTextBox.DocumentText, "uninitialized"); + + Log.Comment("Select Menu Item 11 which should open flyout."); + var item = FindElement.ByName("Menu Item 11"); + InputHelper.LeftClick(item); + Wait.ForIdle(); + + Log.Comment("Select Menu Item 12 which should keep flyout open."); + item = FindElement.ByName("Menu Item 12"); + InputHelper.LeftClick(item); + Wait.ForIdle(); + + Verify.IsNotNull(FindElement.ById("ChildrenFlyout"), "Flyout should still be open."); + + Log.Comment("Select Menu Item 14."); + item = FindElement.ByName("Menu Item 14"); + InputHelper.LeftClick(item); + Wait.ForIdle(); + + // Refresh the cache to make sure that the flyout object we are going to be searching for + // does not return as a false positive due to the caching mechanism. + ElementCache.Refresh(); + Verify.IsNull(FindElement.ById("ChildrenFlyout"), "Flyout should be closed."); + + Log.Comment("Verify that the correct item has been selected"); + var getSelectItemButton = new Button(FindElement.ByName("GetSelectedItemLabelButton")); + getSelectItemButton.Invoke(); + Wait.ForIdle(); + Verify.AreEqual(displayModeTextBox.DocumentText, "Menu Item 14"); + + Log.Comment("Verify that parent has been collapsed"); + TextBlock collapsedItemLabel = new TextBlock(FindElement.ByName("CollapsedItemLabel")); + Verify.AreEqual(collapsedItemLabel.DocumentText, "Last Collapsed: Menu Item 11"); + } + } + + [TestMethod] + [TestProperty("TestSuite", "D")] + public void SelectingNonTopLevelItemInOverflow() + { + using (var setup = new TestSetupHelper(new[] { "NavigationView Tests", "HierarchicalNavigationView Markup Test" })) + { + TextBlock displayModeTextBox = new TextBlock(FindElement.ByName("SelectedItemLabel")); + + Log.Comment("Put NavigationView into Top Mode."); + var panelDisplayModeComboBox = new ComboBox(FindElement.ByName("PaneDisplayModeCombobox")); + panelDisplayModeComboBox.SelectItemByName("Top"); + Wait.ForIdle(); + + InvokeOverflowButton(); + + Log.Comment("Invoke 'Menu Item 29 (Selectable)'."); + var item = FindElement.ByName("Menu Item 29 (Selectable)"); + InputHelper.LeftClick(item); + Wait.ForIdle(); + + Log.Comment("Invoke 'Menu Item 30 (Selectable)'."); + item = FindElement.ByName("Menu Item 30 (Selectable)"); + InputHelper.LeftClick(item); + Wait.ForIdle(); + + Log.Comment("Invoke 'Menu Item 31"); + item = FindElement.ByName("Menu Item 31"); + InputHelper.LeftClick(item); + Wait.ForIdle(); + + Log.Comment("Invoke GetSelectedItemLabelButton and verify selected item is correct."); + var getSelectItemButton = new Button(FindElement.ByName("GetSelectedItemLabelButton")); + getSelectItemButton.Invoke(); + Wait.ForIdle(); + Verify.AreEqual(displayModeTextBox.DocumentText, "Menu Item 31"); + } + } + private void EnsurePaneHeaderCanBeModifiedHelper(RegressionTestType navviewMode) { if (!PlatformConfiguration.IsOsVersionGreaterThanOrEqual(OSVersion.Redstone2)) @@ -4352,7 +4496,9 @@ enum RegressionTestType { LeftNav = 1, TopNav = 2, - LeftNavRS4 = 4 + LeftNavRS4 = 4, + HierarchyMarkup = 8, + HierarchyDatabinding = 16 } class RegressionTestScenario { @@ -4377,6 +4523,10 @@ public static List BuildTopNavRegressionTestScenarios() { return BuildTestScenarios(RegressionTestType.LeftNav | RegressionTestType.TopNav); } + public static List BuildHierarchicalNavRegressionTestScenarios() + { + return BuildTestScenarios(RegressionTestType.HierarchyMarkup | RegressionTestType.HierarchyDatabinding); + } private static List BuildTestScenarios(RegressionTestType types) { Dictionary map = @@ -4384,6 +4534,8 @@ private static List BuildTestScenarios(RegressionTestTyp { { RegressionTestType.LeftNav, new RegressionTestScenario("NavigationView Test", isLeftnavTest: true, isUsingRS4Style: false)}, { RegressionTestType.TopNav, new RegressionTestScenario("NavigationView TopNav Test", isLeftnavTest: false, isUsingRS4Style: false)}, + { RegressionTestType.HierarchyMarkup, new RegressionTestScenario("HierarchicalNavigationView Markup Test", isLeftnavTest: false, isUsingRS4Style: false)}, + { RegressionTestType.HierarchyDatabinding, new RegressionTestScenario("HierarchicalNavigationView DataBinding Test", isLeftnavTest: false, isUsingRS4Style: false)}, }; List scenarios = new List(); diff --git a/dev/NavigationView/NavigationView_rs1_themeresources.xaml b/dev/NavigationView/NavigationView_rs1_themeresources.xaml index 20f5024a7b..708a73ff73 100644 --- a/dev/NavigationView/NavigationView_rs1_themeresources.xaml +++ b/dev/NavigationView/NavigationView_rs1_themeresources.xaml @@ -230,6 +230,8 @@ 8,5,0,0 12,5,0,11 8,4,0,0 + + - @@ -32,6 +31,9 @@ + + + @@ -52,8 +54,7 @@ - - + diff --git a/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml.cs b/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml.cs index 1ada28eb11..4ab8f57763 100644 --- a/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml.cs +++ b/dev/NavigationView/TestUI/NavigationViewCaseBundle.xaml.cs @@ -36,6 +36,8 @@ public NavigationViewCaseBundle() NavigateToCustomThemeResourcesPage.Click += delegate { Frame.NavigateWithoutAnimation(typeof(NavigationViewCustomThemeResourcesPage), 0); }; NavigationViewBlankPage1.Click += delegate { Frame.NavigateWithoutAnimation(typeof(NavigationViewBlankPage1), 0); }; NavigationViewMenuItemStretchPageButton.Click += delegate { Frame.NavigateWithoutAnimation(typeof(NavigationViewMenuItemStretchPage), 0); }; + NavigateToHierarchicalNavigationViewMarkupPage.Click += delegate { Frame.NavigateWithoutAnimation(typeof(HierarchicalNavigationViewMarkup), 0); }; + NavigateToHierarchicalNavigationViewDataBindingPage.Click += delegate { Frame.NavigateWithoutAnimation(typeof(HierarchicalNavigationViewDataBinding), 0); }; } } } diff --git a/dev/NavigationView/TestUI/NavigationView_TestUI.projitems b/dev/NavigationView/TestUI/NavigationView_TestUI.projitems index b36babf4d4..d8f01679f2 100644 --- a/dev/NavigationView/TestUI/NavigationView_TestUI.projitems +++ b/dev/NavigationView/TestUI/NavigationView_TestUI.projitems @@ -10,6 +10,14 @@ NavigationView_TestUI + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + Designer MSBuild:Compile @@ -84,6 +92,12 @@ + + HierarchicalNavigationViewDataBinding.xaml + + + HierarchicalNavigationViewMarkup.xaml + NavigationViewAnimationPage.xaml diff --git a/test/MUXControlsTestApp/master/NavigationViewAuto-7.xml b/test/MUXControlsTestApp/master/NavigationViewAuto-7.xml index dc3d875629..93c6df9f5f 100644 --- a/test/MUXControlsTestApp/master/NavigationViewAuto-7.xml +++ b/test/MUXControlsTestApp/master/NavigationViewAuto-7.xml @@ -871,14 +871,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -886,14 +885,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -906,95 +905,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1002,12 +1006,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1015,8 +1021,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1025,31 +1030,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1064,14 +1129,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1079,14 +1143,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1099,95 +1163,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1195,12 +1264,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1208,8 +1279,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1218,31 +1288,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1361,14 +1491,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1376,14 +1505,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1396,95 +1525,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1492,12 +1626,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1505,8 +1641,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1515,31 +1650,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewAuto-8.xml b/test/MUXControlsTestApp/master/NavigationViewAuto-8.xml index 587840881b..2f2f6a8f01 100644 --- a/test/MUXControlsTestApp/master/NavigationViewAuto-8.xml +++ b/test/MUXControlsTestApp/master/NavigationViewAuto-8.xml @@ -871,14 +871,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -886,14 +885,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -906,95 +905,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1002,12 +1006,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1015,8 +1021,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1025,31 +1030,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1064,14 +1129,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1079,14 +1143,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1099,95 +1163,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1195,12 +1264,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1208,8 +1279,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1218,31 +1288,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1361,14 +1491,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1376,14 +1505,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1396,95 +1525,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1492,12 +1626,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1505,8 +1641,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1515,31 +1650,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewAuto.xml b/test/MUXControlsTestApp/master/NavigationViewAuto.xml index 95017df4e7..7924157c9c 100644 --- a/test/MUXControlsTestApp/master/NavigationViewAuto.xml +++ b/test/MUXControlsTestApp/master/NavigationViewAuto.xml @@ -851,13 +851,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -865,14 +865,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -885,95 +884,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -981,12 +985,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -994,8 +1000,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1004,31 +1009,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=37,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=37,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1042,13 +1107,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1056,14 +1121,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1076,95 +1140,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1172,12 +1241,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1185,8 +1256,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1195,31 +1265,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=23,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=23,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1334,13 +1464,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1348,14 +1478,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1368,95 +1497,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1464,12 +1598,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1477,8 +1613,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1487,31 +1622,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=54,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=54,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftCompact-7.xml b/test/MUXControlsTestApp/master/NavigationViewLeftCompact-7.xml index 038f194d0f..3aba200d10 100644 --- a/test/MUXControlsTestApp/master/NavigationViewLeftCompact-7.xml +++ b/test/MUXControlsTestApp/master/NavigationViewLeftCompact-7.xml @@ -825,14 +825,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -840,14 +839,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -860,95 +859,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -956,12 +960,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -969,8 +975,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -979,31 +984,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=0,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1018,14 +1083,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1033,14 +1097,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1053,95 +1117,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1149,12 +1218,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1162,8 +1233,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1172,31 +1242,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=0,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1315,14 +1445,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1330,14 +1459,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1350,95 +1479,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1446,12 +1580,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1459,8 +1595,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1469,31 +1604,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=0,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftCompact-8.xml b/test/MUXControlsTestApp/master/NavigationViewLeftCompact-8.xml index 4a2fc99c3b..91af86bbbf 100644 --- a/test/MUXControlsTestApp/master/NavigationViewLeftCompact-8.xml +++ b/test/MUXControlsTestApp/master/NavigationViewLeftCompact-8.xml @@ -825,14 +825,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -840,14 +839,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -860,95 +859,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -956,12 +960,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -969,8 +975,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -979,31 +984,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=0,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1018,14 +1083,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1033,14 +1097,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1053,95 +1117,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1149,12 +1218,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1162,8 +1233,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1172,31 +1242,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=0,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1315,14 +1445,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1330,14 +1459,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1350,95 +1479,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1446,12 +1580,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1459,8 +1595,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1469,31 +1604,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=0,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftCompact.xml b/test/MUXControlsTestApp/master/NavigationViewLeftCompact.xml index 287fc58a03..b2ba1302e6 100644 --- a/test/MUXControlsTestApp/master/NavigationViewLeftCompact.xml +++ b/test/MUXControlsTestApp/master/NavigationViewLeftCompact.xml @@ -805,13 +805,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -819,14 +819,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -839,95 +838,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -935,12 +939,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -948,8 +954,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -958,31 +963,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=0,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=37,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=37,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -996,13 +1061,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1010,14 +1075,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1030,95 +1094,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1126,12 +1195,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1139,8 +1210,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1149,31 +1219,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=0,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=23,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=23,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1288,13 +1418,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1302,14 +1432,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1322,95 +1451,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=40,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=40,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1418,12 +1552,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1431,8 +1567,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1441,31 +1576,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=0,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=54,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=54,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftMinimal-7.xml b/test/MUXControlsTestApp/master/NavigationViewLeftMinimal-7.xml index fc545fa46d..b658ac4de3 100644 --- a/test/MUXControlsTestApp/master/NavigationViewLeftMinimal-7.xml +++ b/test/MUXControlsTestApp/master/NavigationViewLeftMinimal-7.xml @@ -871,14 +871,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -886,14 +885,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -906,95 +905,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1002,12 +1006,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1015,8 +1021,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1025,31 +1030,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1064,14 +1129,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1079,14 +1143,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1099,95 +1163,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1195,12 +1264,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1208,8 +1279,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1218,31 +1288,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1361,14 +1491,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1376,14 +1505,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1396,95 +1525,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1492,12 +1626,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1505,8 +1641,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1515,31 +1650,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftMinimal-8.xml b/test/MUXControlsTestApp/master/NavigationViewLeftMinimal-8.xml index d427e5c62d..a647806d7b 100644 --- a/test/MUXControlsTestApp/master/NavigationViewLeftMinimal-8.xml +++ b/test/MUXControlsTestApp/master/NavigationViewLeftMinimal-8.xml @@ -871,14 +871,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -886,14 +885,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -906,95 +905,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1002,12 +1006,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1015,8 +1021,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1025,31 +1030,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1064,14 +1129,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1079,14 +1143,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1099,95 +1163,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1195,12 +1264,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1208,8 +1279,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1218,31 +1288,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1361,14 +1491,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1376,14 +1505,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1396,95 +1525,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1492,12 +1626,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1505,8 +1641,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1515,31 +1650,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftMinimal.xml b/test/MUXControlsTestApp/master/NavigationViewLeftMinimal.xml index 81f7352a9b..9291374a0e 100644 --- a/test/MUXControlsTestApp/master/NavigationViewLeftMinimal.xml +++ b/test/MUXControlsTestApp/master/NavigationViewLeftMinimal.xml @@ -851,13 +851,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -865,14 +865,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -885,95 +884,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -981,12 +985,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -994,8 +1000,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1004,31 +1009,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=37,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=37,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1042,13 +1107,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1056,14 +1121,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1076,95 +1140,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1172,12 +1241,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1185,8 +1256,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1195,31 +1265,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=23,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=23,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1334,13 +1464,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1348,14 +1478,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1368,95 +1497,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1464,12 +1598,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1477,8 +1613,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1487,31 +1622,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=54,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=54,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-7.xml b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-7.xml index 159dc0c0cf..83b3b5fd17 100644 --- a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-7.xml +++ b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-7.xml @@ -1175,14 +1175,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1190,14 +1189,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1210,95 +1209,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1306,12 +1310,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1319,8 +1325,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1329,31 +1334,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=260,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=260,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1368,14 +1433,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1383,14 +1447,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1403,95 +1467,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1499,12 +1568,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1512,8 +1583,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1522,31 +1592,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=260,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=260,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1704,14 +1834,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1719,14 +1848,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1739,95 +1868,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1835,12 +1969,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1848,8 +1984,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1858,31 +1993,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=260,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=260,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-8.xml b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-8.xml index 335d9d05e7..bcc6cf7c39 100644 --- a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-8.xml +++ b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent-8.xml @@ -1175,14 +1175,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1190,14 +1189,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1210,95 +1209,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1306,12 +1310,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1319,8 +1325,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1329,31 +1334,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=260,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=260,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1368,14 +1433,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1383,14 +1447,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1403,95 +1467,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1499,12 +1568,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1512,8 +1583,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1522,31 +1592,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=260,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=260,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1704,14 +1834,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1719,14 +1848,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1739,95 +1868,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1835,12 +1969,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1848,8 +1984,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1858,31 +1993,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=260,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=260,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent.xml b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent.xml index 1a060ec326..2a472c8255 100644 --- a/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent.xml +++ b/test/MUXControlsTestApp/master/NavigationViewLeftPaneContent.xml @@ -1131,13 +1131,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1145,14 +1145,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1165,95 +1164,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1261,12 +1265,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1274,8 +1280,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1284,31 +1289,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=260,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=37,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=260,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=37,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1322,13 +1387,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1336,14 +1401,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1356,95 +1420,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1452,12 +1521,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1465,8 +1536,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1475,31 +1545,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=260,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=23,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=260,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=23,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1652,13 +1782,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1666,14 +1796,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1686,95 +1815,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=300,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=300,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1782,12 +1916,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1795,8 +1931,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1805,31 +1940,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=260,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=54,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=260,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=54,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewScrolling-7.xml b/test/MUXControlsTestApp/master/NavigationViewScrolling-7.xml index 18038ca5c7..00d30816f9 100644 --- a/test/MUXControlsTestApp/master/NavigationViewScrolling-7.xml +++ b/test/MUXControlsTestApp/master/NavigationViewScrolling-7.xml @@ -809,7 +809,7 @@ FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=120,600 + RenderSize=120,562 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -824,14 +824,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -839,14 +838,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -859,95 +858,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -955,12 +959,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -968,8 +974,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -978,31 +983,2302 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter + Name=PresenterContentRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=48,19 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItemHeader] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + CornerRadius=0,0,0,0 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NavigationViewItemHeaderRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=InnerHeaderGrid + Margin=10,0,0,0 + Height=40 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=49,40 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Name=HeaderText + Margin=0,-1,0,-1 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=49,19 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItemSeparator] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + CornerRadius=0,0,0,0 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,21 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NavigationViewItemSeparatorRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,21 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SeparatorLine + Margin=16,10,16,10 + Height=1 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=88,1 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=56,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItemHeader] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + CornerRadius=0,0,0,0 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NavigationViewItemHeaderRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=InnerHeaderGrid + Margin=10,0,0,0 + Height=40 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=53,40 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Name=HeaderText + Margin=0,-1,0,-1 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=53,19 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=56,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1017,14 +3293,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1032,14 +3307,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1052,95 +3327,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1148,12 +3428,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1161,8 +3443,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1171,32 +3452,92 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=48,19 - [Microsoft.UI.Xaml.Controls.NavigationViewItemHeader] + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=56,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItemSeparator] Padding=0,0,0,0 Foreground=#FF000000 BorderThickness=0,0,0,0 @@ -1209,46 +3550,32 @@ FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=120,40 + RenderSize=120,21 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] + Name=NavigationViewItemSeparatorRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=InnerHeaderGrid - Margin=10,0,0,0 - Height=40 + RenderSize=120,21 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SeparatorLine + Margin=16,10,16,10 + Height=1 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=49,40 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Name=HeaderText - Margin=0,-1,0,-1 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=49,19 + RenderSize=88,1 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1263,14 +3590,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1278,14 +3604,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1298,95 +3624,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] + Name=ContentGrid + MinHeight=40 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon - Margin=0,0,0,0 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1394,12 +3725,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1407,8 +3740,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1417,31 +3749,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=56,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1971,14 +4363,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1986,14 +4377,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -2006,95 +4397,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -2102,12 +4498,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -2115,8 +4513,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -2125,31 +4522,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewScrolling-8.xml b/test/MUXControlsTestApp/master/NavigationViewScrolling-8.xml index dcf346204c..ad33336d92 100644 --- a/test/MUXControlsTestApp/master/NavigationViewScrolling-8.xml +++ b/test/MUXControlsTestApp/master/NavigationViewScrolling-8.xml @@ -809,7 +809,7 @@ FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=120,600 + RenderSize=120,562 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -824,14 +824,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -839,14 +838,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -859,95 +858,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -955,12 +959,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -968,8 +974,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -978,31 +983,2302 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter + Name=PresenterContentRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=48,19 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItemHeader] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + CornerRadius=0,0,0,0 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NavigationViewItemHeaderRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=InnerHeaderGrid + Margin=10,0,0,0 + Height=40 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=49,40 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Name=HeaderText + Margin=0,-1,0,-1 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=49,19 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItemSeparator] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + CornerRadius=0,0,0,0 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,21 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NavigationViewItemSeparatorRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,21 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SeparatorLine + Margin=16,10,16,10 + Height=1 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=88,1 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=56,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItemHeader] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + CornerRadius=0,0,0,0 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NavigationViewItemHeaderRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=InnerHeaderGrid + Margin=10,0,0,0 + Height=40 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=53,40 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Name=HeaderText + Margin=0,-1,0,-1 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=53,19 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=56,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1017,14 +3293,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1032,14 +3307,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1052,95 +3327,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1148,12 +3428,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1161,8 +3443,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1171,32 +3452,92 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=48,19 - [Microsoft.UI.Xaml.Controls.NavigationViewItemHeader] + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=56,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItemSeparator] Padding=0,0,0,0 Foreground=#FF000000 BorderThickness=0,0,0,0 @@ -1209,46 +3550,32 @@ FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=120,40 + RenderSize=120,21 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] + Name=NavigationViewItemSeparatorRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=InnerHeaderGrid - Margin=10,0,0,0 - Height=40 + RenderSize=120,21 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SeparatorLine + Margin=16,10,16,10 + Height=1 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=49,40 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Name=HeaderText - Margin=0,-1,0,-1 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=49,19 + RenderSize=88,1 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -1263,14 +3590,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1278,14 +3604,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1298,95 +3624,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] + Name=ContentGrid + MinHeight=40 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon - Margin=0,0,0,0 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1394,12 +3725,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1407,8 +3740,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1417,31 +3749,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=48,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=56,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1971,14 +4363,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1986,14 +4377,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -2006,95 +4397,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -2102,12 +4498,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -2115,8 +4513,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -2125,31 +4522,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=50,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewScrolling.xml b/test/MUXControlsTestApp/master/NavigationViewScrolling.xml index b8e44d99ea..4053d8fc52 100644 --- a/test/MUXControlsTestApp/master/NavigationViewScrolling.xml +++ b/test/MUXControlsTestApp/master/NavigationViewScrolling.xml @@ -790,7 +790,7 @@ FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=120,600 + RenderSize=120,562 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -804,13 +804,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -818,14 +818,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -838,95 +837,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -934,12 +938,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -947,8 +953,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -957,31 +962,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=51,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=51,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -995,13 +1060,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1009,14 +1074,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1029,95 +1093,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1125,12 +1194,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1138,8 +1209,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1148,50 +1218,111 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=51,20 - [Microsoft.UI.Xaml.Controls.NavigationViewItemHeader] - Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=51,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItemHeader] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] + Name=NavigationViewItemHeaderRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1238,13 +1369,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1252,14 +1383,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1272,47 +1402,264 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=51,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot MinHeight=40 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1321,46 +1668,2011 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=51,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItemSeparator] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,21 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NavigationViewItemSeparatorRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,21 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SeparatorLine + Margin=16,10,16,10 + Height=1 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=88,1 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=51,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=51,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=51,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=59,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItemHeader] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NavigationViewItemHeaderRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=InnerHeaderGrid + Margin=10,0,0,0 + Height=40 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=57,40 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Name=HeaderText + Margin=0,-1,0,-1 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=57,20 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=59,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=59,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.NavigationViewItemSeparator] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,21 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NavigationViewItemSeparatorRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,21 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SeparatorLine + Margin=16,10,16,10 + Height=1 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=88,1 + [Microsoft.UI.Xaml.Controls.NavigationViewItem] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + Padding=0,0,0,0 + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=NavigationViewItemPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Margin=4,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator + Margin=0,0,0,0 + Height=24 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] + Name=ContentGrid + MinHeight=40 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon - Margin=0,0,0,0 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1368,12 +3680,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1381,8 +3695,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -1391,31 +3704,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=51,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=59,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 @@ -1931,13 +4304,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1945,14 +4318,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot - MinHeight=40 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -1965,95 +4337,100 @@ CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Margin=4,0,0,0 + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot + MinHeight=40 + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Width=2 - Name=SelectionIndicator + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder Margin=0,0,0,0 - Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=2,24 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid - MinHeight=40 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=120,40 - [Windows.UI.Xaml.Controls.Viewbox] - Name=IconBox - Margin=12,0,12,0 - Height=16 + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=PresenterContentRootGrid + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Margin=0,0,0,0 + Margin=4,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=Icon + RenderSize=2,24 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Width=2 + Name=SelectionIndicator Margin=0,0,0,0 + Height=24 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] - Foreground=#FF000000 + RenderSize=2,24 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + MinHeight=40 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=120,40 + [Windows.UI.Xaml.Controls.Viewbox] + Name=IconBox + Margin=12,0,12,0 + Height=16 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -2061,12 +4438,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=#00000000 + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -2074,8 +4453,7 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 + [Windows.UI.Xaml.Controls.SymbolIcon] Foreground=#FF000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 @@ -2084,31 +4462,91 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#FF000000 - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=ContentPresenter - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=80,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#FF000000 - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=54,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#FF000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=80,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=54,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=12,0,12,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=40 + Name=ExpandCollapseChevron + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Width=12 + Margin=0,0,0,0 + Height=12 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Shapes.Rectangle] StrokeThickness=1 Width=1 diff --git a/test/MUXControlsTestApp/master/NavigationViewTop-7.xml b/test/MUXControlsTestApp/master/NavigationViewTop-7.xml index aee07d5266..02c9cec9bb 100644 --- a/test/MUXControlsTestApp/master/NavigationViewTop-7.xml +++ b/test/MUXControlsTestApp/master/NavigationViewTop-7.xml @@ -417,14 +417,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -432,13 +431,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -446,37 +446,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=PointerRectangle - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Collapsed - RenderSize=0,0 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=90,40 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -484,38 +460,61 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Windows.UI.Xaml.Controls.Viewbox] - Width=16 - Name=IconBox - Margin=16,0,0,0 - Height=16 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=PointerRectangle + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Margin=0,0,0,0 + RenderSize=90,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=90,40 + [Windows.UI.Xaml.Controls.Viewbox] + Width=16 + Name=IconBox + Margin=16,0,0,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -523,8 +522,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] + [Windows.UI.Xaml.Controls.ContentPresenter] Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -532,12 +537,8 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=#00000000 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#99000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -545,9 +546,12 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#99000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -555,56 +559,101 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=8,0,16,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=24 + Name=ExpandCollapseChevron + Margin=-16,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter - Margin=8,0,16,0 + Name=SelectionIndicatorGrid + Margin=16,0,16,4 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=34,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#99000000 + RenderSize=58,2 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SelectionIndicator Margin=0,0,0,0 + Height=2 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=34,19 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=SelectionIndicatorGrid - Margin=16,0,16,4 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=58,2 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=SelectionIndicator - Margin=0,0,0,0 - Height=2 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=58,2 + RenderSize=58,2 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -619,14 +668,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -634,13 +682,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -648,37 +697,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=PointerRectangle - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Collapsed - RenderSize=0,0 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=78,40 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -686,38 +711,61 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Windows.UI.Xaml.Controls.Viewbox] - Width=16 - Name=IconBox - Margin=16,0,0,0 - Height=16 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=PointerRectangle + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Margin=0,0,0,0 + RenderSize=78,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=78,40 + [Windows.UI.Xaml.Controls.Viewbox] + Width=16 + Name=IconBox + Margin=16,0,0,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -725,8 +773,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] + [Windows.UI.Xaml.Controls.ContentPresenter] Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -734,12 +788,8 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=#00000000 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#99000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -747,9 +797,12 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#99000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -757,56 +810,101 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=8,0,16,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=24 + Name=ExpandCollapseChevron + Margin=-16,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter - Margin=8,0,16,0 + Name=SelectionIndicatorGrid + Margin=16,0,16,4 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=22,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#99000000 + RenderSize=46,2 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SelectionIndicator Margin=0,0,0,0 + Height=2 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=22,19 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=SelectionIndicatorGrid - Margin=16,0,16,4 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=46,2 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=SelectionIndicator - Margin=0,0,0,0 - Height=2 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=46,2 + RenderSize=46,2 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 diff --git a/test/MUXControlsTestApp/master/NavigationViewTop-8.xml b/test/MUXControlsTestApp/master/NavigationViewTop-8.xml index 2d52830644..3d00f52b78 100644 --- a/test/MUXControlsTestApp/master/NavigationViewTop-8.xml +++ b/test/MUXControlsTestApp/master/NavigationViewTop-8.xml @@ -417,14 +417,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -432,13 +431,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -446,37 +446,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=PointerRectangle - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Collapsed - RenderSize=0,0 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=90,40 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -484,38 +460,61 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Windows.UI.Xaml.Controls.Viewbox] - Width=16 - Name=IconBox - Margin=16,0,0,0 - Height=16 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=PointerRectangle + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Margin=0,0,0,0 + RenderSize=90,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=90,40 + [Windows.UI.Xaml.Controls.Viewbox] + Width=16 + Name=IconBox + Margin=16,0,0,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -523,8 +522,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] + [Windows.UI.Xaml.Controls.ContentPresenter] Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -532,12 +537,8 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=#00000000 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#99000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -545,9 +546,12 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#99000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -555,56 +559,101 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=8,0,16,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=24 + Name=ExpandCollapseChevron + Margin=-16,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter - Margin=8,0,16,0 + Name=SelectionIndicatorGrid + Margin=16,0,16,4 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=34,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#99000000 + RenderSize=58,2 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SelectionIndicator Margin=0,0,0,0 + Height=2 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=34,19 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=SelectionIndicatorGrid - Margin=16,0,16,4 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=58,2 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=SelectionIndicator - Margin=0,0,0,0 - Height=2 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=58,2 + RenderSize=58,2 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -619,14 +668,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -634,13 +682,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -648,37 +697,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=PointerRectangle - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Collapsed - RenderSize=0,0 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=78,40 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -686,38 +711,61 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Windows.UI.Xaml.Controls.Viewbox] - Width=16 - Name=IconBox - Margin=16,0,0,0 - Height=16 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=PointerRectangle + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Margin=0,0,0,0 + RenderSize=78,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=78,40 + [Windows.UI.Xaml.Controls.Viewbox] + Width=16 + Name=IconBox + Margin=16,0,0,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -725,8 +773,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] + [Windows.UI.Xaml.Controls.ContentPresenter] Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -734,12 +788,8 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=#00000000 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#99000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -747,9 +797,12 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#99000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -757,56 +810,101 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=8,0,16,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=24 + Name=ExpandCollapseChevron + Margin=-16,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter - Margin=8,0,16,0 + Name=SelectionIndicatorGrid + Margin=16,0,16,4 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=22,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#99000000 + RenderSize=46,2 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SelectionIndicator Margin=0,0,0,0 + Height=2 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=22,19 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=SelectionIndicatorGrid - Margin=16,0,16,4 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=46,2 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=SelectionIndicator - Margin=0,0,0,0 - Height=2 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=46,2 + RenderSize=46,2 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 diff --git a/test/MUXControlsTestApp/master/NavigationViewTop.xml b/test/MUXControlsTestApp/master/NavigationViewTop.xml index fd6f082754..837b62d53f 100644 --- a/test/MUXControlsTestApp/master/NavigationViewTop.xml +++ b/test/MUXControlsTestApp/master/NavigationViewTop.xml @@ -408,13 +408,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=93,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -422,13 +422,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=93,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -436,37 +436,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=93,40 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=PointerRectangle - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Collapsed - RenderSize=0,0 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=93,40 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -474,38 +450,61 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=93,40 - [Windows.UI.Xaml.Controls.Viewbox] - Width=16 - Name=IconBox - Margin=16,0,0,0 - Height=16 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=PointerRectangle + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Margin=0,0,0,0 + RenderSize=93,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=93,40 + [Windows.UI.Xaml.Controls.Viewbox] + Width=16 + Name=IconBox + Margin=16,0,0,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -513,8 +512,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] + [Windows.UI.Xaml.Controls.ContentPresenter] Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -522,12 +527,8 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=#00000000 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#99000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -535,9 +536,12 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#99000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -545,56 +549,101 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=8,0,16,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=37,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=37,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=24 + Name=ExpandCollapseChevron + Margin=-16,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter - Margin=8,0,16,0 + Name=SelectionIndicatorGrid + Margin=16,0,16,4 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=37,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#99000000 + RenderSize=61,2 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SelectionIndicator Margin=0,0,0,0 + Height=2 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=37,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=SelectionIndicatorGrid - Margin=16,0,16,4 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=61,2 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=SelectionIndicator - Margin=0,0,0,0 - Height=2 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=61,2 + RenderSize=61,2 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -608,13 +657,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=79,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -622,13 +671,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=79,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -636,37 +685,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=79,40 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=PointerRectangle - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Collapsed - RenderSize=0,0 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=79,40 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -674,38 +699,61 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=79,40 - [Windows.UI.Xaml.Controls.Viewbox] - Width=16 - Name=IconBox - Margin=16,0,0,0 - Height=16 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=PointerRectangle + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Margin=0,0,0,0 + RenderSize=79,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=79,40 + [Windows.UI.Xaml.Controls.Viewbox] + Width=16 + Name=IconBox + Margin=16,0,0,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -713,8 +761,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] + [Windows.UI.Xaml.Controls.ContentPresenter] Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -722,12 +776,8 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=#00000000 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#99000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -735,9 +785,12 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#99000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -745,56 +798,101 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=8,0,16,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=23,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=23,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=24 + Name=ExpandCollapseChevron + Margin=-16,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter - Margin=8,0,16,0 + Name=SelectionIndicatorGrid + Margin=16,0,16,4 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=23,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#99000000 + RenderSize=47,2 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SelectionIndicator Margin=0,0,0,0 + Height=2 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=23,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=SelectionIndicatorGrid - Margin=16,0,16,4 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=47,2 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=SelectionIndicator - Margin=0,0,0,0 - Height=2 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=47,2 + RenderSize=47,2 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 diff --git a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-7.xml b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-7.xml index 70bfa902bc..95cd02c33c 100644 --- a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-7.xml +++ b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-7.xml @@ -456,14 +456,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -471,13 +470,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -485,37 +485,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=PointerRectangle - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Collapsed - RenderSize=0,0 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=90,40 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -523,38 +499,61 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Windows.UI.Xaml.Controls.Viewbox] - Width=16 - Name=IconBox - Margin=16,0,0,0 - Height=16 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=PointerRectangle + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Margin=0,0,0,0 + RenderSize=90,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=90,40 + [Windows.UI.Xaml.Controls.Viewbox] + Width=16 + Name=IconBox + Margin=16,0,0,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -562,8 +561,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] + [Windows.UI.Xaml.Controls.ContentPresenter] Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -571,12 +576,8 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=#00000000 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#99000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -584,9 +585,12 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#99000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -594,56 +598,101 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=8,0,16,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=24 + Name=ExpandCollapseChevron + Margin=-16,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter - Margin=8,0,16,0 + Name=SelectionIndicatorGrid + Margin=16,0,16,4 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=34,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#99000000 + RenderSize=58,2 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SelectionIndicator Margin=0,0,0,0 + Height=2 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=34,19 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=SelectionIndicatorGrid - Margin=16,0,16,4 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=58,2 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=SelectionIndicator - Margin=0,0,0,0 - Height=2 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=58,2 + RenderSize=58,2 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -658,14 +707,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -673,13 +721,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -687,37 +736,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=PointerRectangle - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Collapsed - RenderSize=0,0 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=78,40 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -725,38 +750,61 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Windows.UI.Xaml.Controls.Viewbox] - Width=16 - Name=IconBox - Margin=16,0,0,0 - Height=16 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=PointerRectangle + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Margin=0,0,0,0 + RenderSize=78,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=78,40 + [Windows.UI.Xaml.Controls.Viewbox] + Width=16 + Name=IconBox + Margin=16,0,0,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -764,8 +812,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] + [Windows.UI.Xaml.Controls.ContentPresenter] Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -773,12 +827,8 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=#00000000 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#99000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -786,9 +836,12 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#99000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -796,56 +849,101 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=8,0,16,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=24 + Name=ExpandCollapseChevron + Margin=-16,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter - Margin=8,0,16,0 + Name=SelectionIndicatorGrid + Margin=16,0,16,4 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=22,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#99000000 + RenderSize=46,2 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SelectionIndicator Margin=0,0,0,0 + Height=2 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=22,19 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=SelectionIndicatorGrid - Margin=16,0,16,4 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=46,2 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=SelectionIndicator - Margin=0,0,0,0 - Height=2 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=46,2 + RenderSize=46,2 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 diff --git a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-8.xml b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-8.xml index e3e2ebc27a..09cd193be6 100644 --- a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-8.xml +++ b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent-8.xml @@ -456,14 +456,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -471,13 +470,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -485,37 +485,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=PointerRectangle - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Collapsed - RenderSize=0,0 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=90,40 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -523,38 +499,61 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=90,40 - [Windows.UI.Xaml.Controls.Viewbox] - Width=16 - Name=IconBox - Margin=16,0,0,0 - Height=16 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=PointerRectangle + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Margin=0,0,0,0 + RenderSize=90,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=90,40 + [Windows.UI.Xaml.Controls.Viewbox] + Width=16 + Name=IconBox + Margin=16,0,0,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -562,8 +561,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] + [Windows.UI.Xaml.Controls.ContentPresenter] Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -571,12 +576,8 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=#00000000 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#99000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -584,9 +585,12 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#99000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -594,56 +598,101 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=8,0,16,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=34,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=24 + Name=ExpandCollapseChevron + Margin=-16,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter - Margin=8,0,16,0 + Name=SelectionIndicatorGrid + Margin=16,0,16,4 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=34,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#99000000 + RenderSize=58,2 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SelectionIndicator Margin=0,0,0,0 + Height=2 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=34,19 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=SelectionIndicatorGrid - Margin=16,0,16,4 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=58,2 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=SelectionIndicator - Margin=0,0,0,0 - Height=2 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=58,2 + RenderSize=58,2 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -658,14 +707,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - CornerRadius=2,2,2,2 - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -673,13 +721,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot + CornerRadius=2,2,2,2 + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -687,37 +736,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=PointerRectangle - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Collapsed - RenderSize=0,0 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=78,40 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -725,38 +750,61 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=78,40 - [Windows.UI.Xaml.Controls.Viewbox] - Width=16 - Name=IconBox - Margin=16,0,0,0 - Height=16 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=PointerRectangle + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Margin=0,0,0,0 + RenderSize=78,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=78,40 + [Windows.UI.Xaml.Controls.Viewbox] + Width=16 + Name=IconBox + Margin=16,0,0,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -764,8 +812,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] + [Windows.UI.Xaml.Controls.ContentPresenter] Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -773,12 +827,8 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=#00000000 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#99000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -786,9 +836,12 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#99000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -796,56 +849,101 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=8,0,16,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=22,19 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=24 + Name=ExpandCollapseChevron + Margin=-16,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter - Margin=8,0,16,0 + Name=SelectionIndicatorGrid + Margin=16,0,16,4 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=22,19 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#99000000 + RenderSize=46,2 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SelectionIndicator Margin=0,0,0,0 + Height=2 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=22,19 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=SelectionIndicatorGrid - Margin=16,0,16,4 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=46,2 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=SelectionIndicator - Margin=0,0,0,0 - Height=2 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=46,2 + RenderSize=46,2 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 diff --git a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent.xml b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent.xml index 380ecc7a82..4deed0fd99 100644 --- a/test/MUXControlsTestApp/master/NavigationViewTopPaneContent.xml +++ b/test/MUXControlsTestApp/master/NavigationViewTopPaneContent.xml @@ -446,13 +446,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=93,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -460,13 +460,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=93,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -474,37 +474,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=93,40 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=PointerRectangle - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Collapsed - RenderSize=0,0 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=93,40 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -512,38 +488,61 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=93,40 - [Windows.UI.Xaml.Controls.Viewbox] - Width=16 - Name=IconBox - Margin=16,0,0,0 - Height=16 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=PointerRectangle + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Margin=0,0,0,0 + RenderSize=93,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=93,40 + [Windows.UI.Xaml.Controls.Viewbox] + Width=16 + Name=IconBox + Margin=16,0,0,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -551,8 +550,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] + [Windows.UI.Xaml.Controls.ContentPresenter] Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -560,12 +565,8 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=#00000000 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#99000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -573,9 +574,12 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#99000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -583,56 +587,101 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=8,0,16,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=37,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=37,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=24 + Name=ExpandCollapseChevron + Margin=-16,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter - Margin=8,0,16,0 + Name=SelectionIndicatorGrid + Margin=16,0,16,4 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=37,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#99000000 + RenderSize=61,2 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SelectionIndicator Margin=0,0,0,0 + Height=2 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=37,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=SelectionIndicatorGrid - Margin=16,0,16,4 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=61,2 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=SelectionIndicator - Margin=0,0,0,0 - Height=2 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=61,2 + RenderSize=61,2 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Microsoft.UI.Xaml.Controls.NavigationViewItem] Padding=0,0,0,0 Foreground=#FF000000 @@ -646,13 +695,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=79,40 - [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#FF000000 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=NavigationViewItemPresenter + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=NVIRootGrid Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -660,13 +709,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=79,40 - [Windows.UI.Xaml.Controls.Grid] + [Microsoft.UI.Xaml.Controls.Primitives.NavigationViewItemPresenter] Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] + Foreground=#FF000000 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush - Name=LayoutRoot + Name=NavigationViewItemPresenter Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -674,37 +723,13 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=79,40 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=PointerRectangle - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Collapsed - RenderSize=0,0 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=1,1,1,1 - BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush - Background=[NULL] - Name=RevealBorder - Margin=0,0,0,0 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=79,40 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] - Background=[NULL] - Name=ContentGrid + Background=Microsoft.UI.Xaml.Media.RevealBackgroundBrush + Name=LayoutRoot Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -712,38 +737,61 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=79,40 - [Windows.UI.Xaml.Controls.Viewbox] - Width=16 - Name=IconBox - Margin=16,0,0,0 - Height=16 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=PointerRectangle + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Border] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=1,1,1,1 + BorderBrush=Microsoft.UI.Xaml.Media.RevealBorderBrush + Background=[NULL] + Name=RevealBorder + Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=16,16 - [Windows.UI.Xaml.Controls.Border] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Margin=0,0,0,0 + RenderSize=79,40 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentGrid + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=79,40 + [Windows.UI.Xaml.Controls.Viewbox] + Width=16 + Name=IconBox + Margin=16,0,0,0 + Height=16 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + RenderSize=16,16 + [Windows.UI.Xaml.Controls.Border] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -751,8 +799,14 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.SymbolIcon] + [Windows.UI.Xaml.Controls.ContentPresenter] Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=Icon Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -760,12 +814,8 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=#00000000 + [Windows.UI.Xaml.Controls.SymbolIcon] + Foreground=#99000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -773,9 +823,12 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.TextBlock] + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 - Foreground=#99000000 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00000000 Margin=0,0,0,0 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF @@ -783,56 +836,101 @@ FocusVisualPrimaryBrush=#FF000000 Visibility=Visible RenderSize=20,20 - [Windows.UI.Xaml.Controls.ContentPresenter] - Foreground=#99000000 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=20,20 + [Windows.UI.Xaml.Controls.ContentPresenter] + Foreground=#99000000 + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=[NULL] + Name=ContentPresenter + Margin=8,0,16,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=23,20 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#99000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=23,20 + [Windows.UI.Xaml.Controls.Grid] + Padding=0,0,0,0 + CornerRadius=0,0,0,0 + BorderThickness=0,0,0,0 + BorderBrush=[NULL] + Background=#00FFFFFF + Width=24 + Name=ExpandCollapseChevron + Margin=-16,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 + [Windows.UI.Xaml.Controls.TextBlock] + Padding=0,0,0,0 + Foreground=#FF000000 + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Visible + RenderSize=0,0 + [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0 BorderThickness=0,0,0,0 BorderBrush=[NULL] Background=[NULL] - Name=ContentPresenter - Margin=8,0,16,0 + Name=SelectionIndicatorGrid + Margin=16,0,16,4 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=23,20 - [Windows.UI.Xaml.Controls.TextBlock] - Padding=0,0,0,0 - Foreground=#99000000 + RenderSize=47,2 + [Windows.UI.Xaml.Shapes.Rectangle] + StrokeThickness=1 + Name=SelectionIndicator Margin=0,0,0,0 + Height=2 FocusVisualSecondaryThickness=1,1,1,1 FocusVisualSecondaryBrush=#99FFFFFF FocusVisualPrimaryThickness=2,2,2,2 FocusVisualPrimaryBrush=#FF000000 Visibility=Visible - RenderSize=23,20 - [Windows.UI.Xaml.Controls.Grid] - Padding=0,0,0,0 - CornerRadius=0,0,0,0 - BorderThickness=0,0,0,0 - BorderBrush=[NULL] - Background=[NULL] - Name=SelectionIndicatorGrid - Margin=16,0,16,4 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=47,2 - [Windows.UI.Xaml.Shapes.Rectangle] - StrokeThickness=1 - Name=SelectionIndicator - Margin=0,0,0,0 - Height=2 - FocusVisualSecondaryThickness=1,1,1,1 - FocusVisualSecondaryBrush=#99FFFFFF - FocusVisualPrimaryThickness=2,2,2,2 - FocusVisualPrimaryBrush=#FF000000 - Visibility=Visible - RenderSize=47,2 + RenderSize=47,2 + [Microsoft.UI.Xaml.Controls.ItemsRepeater] + Background=[NULL] + Name=NavigationViewItemMenuItemsHost + Margin=0,0,0,0 + FocusVisualSecondaryThickness=1,1,1,1 + FocusVisualSecondaryBrush=#99FFFFFF + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualPrimaryBrush=#FF000000 + Visibility=Collapsed + RenderSize=0,0 [Windows.UI.Xaml.Controls.Grid] Padding=0,0,0,0 CornerRadius=0,0,0,0