diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/NavigationView.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/NavigationView.xaml index 626a5251f757..49c688caa1a0 100644 --- a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/NavigationView.xaml +++ b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/NavigationView.xaml @@ -1,5 +1,5 @@  - + @@ -616,7 +616,7 @@ diff --git a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml index 165a1a31ede3..f5406a752df8 100644 --- a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml +++ b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml @@ -17979,7 +17979,7 @@ - + @@ -18096,7 +18096,7 @@ - + diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/NavigationView/NavigationView.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/NavigationView/NavigationView.cs index ac49aa4d8409..092c9f60c2a0 100644 --- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/NavigationView/NavigationView.cs +++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/NavigationView/NavigationView.cs @@ -1546,21 +1546,21 @@ private void OnLayoutUpdated(object sender, object e) private void OnSizeChanged(object sender, SizeChangedEventArgs args) { var width = args.NewSize.Width; - UpdateOpenPaneWidth(width); + UpdateOpenPaneLength(width); UpdateAdaptiveLayout(width); UpdateTitleBarPadding(); UpdateBackAndCloseButtonsVisibility(); UpdatePaneLayout(); } - private void UpdateOpenPaneWidth(double width) + private void UpdateOpenPaneLength(double width) { if (!IsTopNavigationView() && m_rootSplitView != null) { - m_openPaneWidth = Math.Max(0.0, Math.Min(width, OpenPaneLength)); + m_openPaneLength = Math.Max(0.0, Math.Min(width, OpenPaneLength)); var templateSettings = GetTemplateSettings(); - templateSettings.OpenPaneWidth = m_openPaneWidth; + templateSettings.OpenPaneLength = m_openPaneLength; } } @@ -4392,7 +4392,7 @@ private void OnPropertyChanged(DependencyPropertyChangedEventArgs args) } else if (property == OpenPaneLengthProperty) { - UpdateOpenPaneWidth(ActualWidth); + UpdateOpenPaneLength(ActualWidth); } } @@ -4771,13 +4771,13 @@ private void UpdatePaneToggleSize() { if (splitView.DisplayMode == SplitViewDisplayMode.Overlay && IsPaneOpen) { - width = m_openPaneWidth; - togglePaneButtonWidth = m_openPaneWidth - ((ShouldShowBackButton() || ShouldShowCloseButton()) ? c_backButtonWidth : 0); + width = m_openPaneLength; + togglePaneButtonWidth = m_openPaneLength - ((ShouldShowBackButton() || ShouldShowCloseButton()) ? c_backButtonWidth : 0); } else if (!(splitView.DisplayMode == SplitViewDisplayMode.Overlay && !IsPaneOpen)) { - width = m_openPaneWidth; - togglePaneButtonWidth = m_openPaneWidth; + width = m_openPaneLength; + togglePaneButtonWidth = m_openPaneLength; } } @@ -5285,11 +5285,11 @@ private void UpdatePaneShadow() // Ensure shadow is as wide as the pane when it is open if (DisplayMode == NavigationViewDisplayMode.Compact) { - shadowReceiver.Width = m_openPaneWidth; + shadowReceiver.Width = m_openPaneLength; } else { - shadowReceiver.Width = m_openPaneWidth - shadowReceiverMargin.Right; + shadowReceiver.Width = m_openPaneLength - shadowReceiverMargin.Right; } shadowReceiver.Margin(shadowReceiverMargin); } diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/NavigationView/NavigationViewTemplateSettings.Properties.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/NavigationView/NavigationViewTemplateSettings.Properties.cs index dc715794694b..e74d253dd409 100644 --- a/src/Uno.UI/Microsoft/UI/Xaml/Controls/NavigationView/NavigationViewTemplateSettings.Properties.cs +++ b/src/Uno.UI/Microsoft/UI/Xaml/Controls/NavigationView/NavigationViewTemplateSettings.Properties.cs @@ -1,6 +1,6 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -// MUX Reference NavigationViewTemplateSettings.properties.cpp, commit 991c831 +// MUX Reference NavigationViewTemplateSettings.properties.cpp, commit bace2c5 using Windows.UI.Xaml; @@ -52,17 +52,17 @@ public Visibility LeftPaneVisibility /// /// Gets the width of open pane. /// - public double OpenPaneWidth + public double OpenPaneLength { - get => (double)GetValue(OpenPaneWidthProperty); - set => SetValue(OpenPaneWidthProperty, value); + get => (double)GetValue(OpenPaneLengthProperty); + set => SetValue(OpenPaneLengthProperty, value); } /// - /// Identifies the OpenPaneWidth dependency property. + /// Identifies the OpenPaneLength dependency property. /// - public static DependencyProperty OpenPaneWidthProperty { get; } = - DependencyProperty.Register(nameof(OpenPaneWidth), typeof(double), typeof(NavigationViewTemplateSettings), new FrameworkPropertyMetadata(320.0)); + public static DependencyProperty OpenPaneLengthProperty { get; } = + DependencyProperty.Register(nameof(OpenPaneLength), typeof(double), typeof(NavigationViewTemplateSettings), new FrameworkPropertyMetadata(320.0)); /// /// Gets the visibility of the overflow button.