feat(NavigationView): Include NavigationViewTemplateSettings.OpenPane…

…Length Update microsoft/microsoft-ui-xaml#7341
unoplatform · Sep 18, 2023 · 4db764c · 4db764c
1 parent 17e7855
commit 4db764c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git 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 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<!-- MUX reference NavigationBackButton_v1.xaml, commit d3fef08fd -->
+<!-- MUX reference NavigationBackButton_v1.xaml, commit bace2c5 -->
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -402,7 +402,7 @@
                                 DisplayMode="Inline"
                                 IsPaneOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPaneOpen, Mode=TwoWay}"
                                 IsTabStop="False"
-                                OpenPaneLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneWidth}"
+                                OpenPaneLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneLength}"
                                 PaneBackground="{ThemeResource NavigationViewDefaultPaneBackground}"
                                 Grid.Row="1"
                                 contract7Present:CornerRadius="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource RightCornerRadiusFilterConverter}}">
@@ -616,7 +616,7 @@
                             <Grid
                                 x:Name="ShadowCaster"
                                 Grid.RowSpan="2"
-                                Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneWidth}"
+                                Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneLength}"
                                 HorizontalAlignment="Left">
                                 <Grid.RenderTransform>
                                     <CompositeTransform x:Name="ShadowCasterTransform" />

diff --git a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
@@ -17979,7 +17979,7 @@
                 <Border x:Name="TopNavContentOverlayAreaGrid" Child="{TemplateBinding ContentOverlay}" />
               </StackPanel>
               <!-- Displaymode (compact/minimal/normal) left -->
-              <SplitView x:Name="RootSplitView" Background="{TemplateBinding Background}" BorderBrush="{ThemeResource NavigationViewItemSeparatorForeground}" BorderThickness="{ThemeResource NavigationViewBorderThickness}" CompactPaneLength="{TemplateBinding CompactPaneLength}" DisplayMode="Inline" IsPaneOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPaneOpen, Mode=TwoWay}" IsTabStop="False" OpenPaneLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneWidth}" PaneBackground="{ThemeResource NavigationViewDefaultPaneBackground}" Grid.Row="1" contract7Present:CornerRadius="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource RightCornerRadiusFilterConverter}}">
+              <SplitView x:Name="RootSplitView" Background="{TemplateBinding Background}" BorderBrush="{ThemeResource NavigationViewItemSeparatorForeground}" BorderThickness="{ThemeResource NavigationViewBorderThickness}" CompactPaneLength="{TemplateBinding CompactPaneLength}" DisplayMode="Inline" IsPaneOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPaneOpen, Mode=TwoWay}" IsTabStop="False" OpenPaneLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneLength}" PaneBackground="{ThemeResource NavigationViewDefaultPaneBackground}" Grid.Row="1" contract7Present:CornerRadius="{Binding Source={ThemeResource OverlayCornerRadius}, Converter={StaticResource RightCornerRadiusFilterConverter}}">
                 <SplitView.Pane>
                   <Grid x:Name="PaneContentGrid" BorderBrush="{ThemeResource NavigationViewItemSeparatorForeground}" HorizontalAlignment="Left" Margin="{ThemeResource NavigationViewPaneContentGridMargin}" Visibility="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.LeftPaneVisibility}">
                     <Grid.RowDefinitions>
@@ -18096,7 +18096,7 @@
                   </Grid>
                 </SplitView.Content>
               </SplitView>
-              <Grid x:Name="ShadowCaster" Grid.RowSpan="2" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneWidth}" HorizontalAlignment="Left">
+              <Grid x:Name="ShadowCaster" Grid.RowSpan="2" Width="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.OpenPaneLength}" HorizontalAlignment="Left">
                 <Grid.RenderTransform>
                   <CompositeTransform x:Name="ShadowCasterTransform" />
                 </Grid.RenderTransform>

diff --git 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/...UI/Microsoft/UI/Xaml/Controls/NavigationView/NavigationViewTemplateSettings.Properties.cs b/...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
 	/// <summary>
 	/// Gets the width of open pane.
 	/// </summary>
-	public double OpenPaneWidth
+	public double OpenPaneLength
 	{
-		get => (double)GetValue(OpenPaneWidthProperty);
-		set => SetValue(OpenPaneWidthProperty, value);
+		get => (double)GetValue(OpenPaneLengthProperty);
+		set => SetValue(OpenPaneLengthProperty, value);
 	}
 
 	/// <summary>
-	/// Identifies the OpenPaneWidth dependency property.
+	/// Identifies the OpenPaneLength dependency property.
 	/// </summary>
-	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));
 
 	/// <summary>
 	/// Gets the visibility of the overflow button.