chore: Update TabViewListView to winui3/release/1.6.1

unoplatform · Oct 22, 2024 · 0374eba · 0374eba
1 parent 0f914e3
commit 0374eba
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 15 deletions.
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabView.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabView.cs
@@ -1187,7 +1187,7 @@ protected override Size MeasureOverride(Size availableSize)
 		return base.MeasureOverride(availableSize);
 	}
 
-	private void UpdateTabWidths(bool shouldUpdateWidths = true, bool fillAllAvailableSpace = true)
+	internal void UpdateTabWidths(bool shouldUpdateWidths = true, bool fillAllAvailableSpace = true)
 	{
 		double tabWidth = double.NaN;
 

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabViewAutomationPeer.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabViewAutomationPeer.cs
@@ -3,11 +3,10 @@
 // MUX Reference: TabViewAutomationPeer.cpp, commit 542e6f9
 
 using System;
-using Microsoft/* UWP don't rename */.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Automation.Provider;
+using Microsoft/* UWP don't rename */.UI.Xaml.Controls;
 
-namespace Microsoft.UI.Xaml.Automation.Peers;
+namespace Microsoft/* UWP don't rename */.UI.Xaml.Automation.Peers;
 
 /// <summary>
 /// Exposes TabView types to Microsoft UI Automation.

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabViewExternalTornOutTabsDroppedEventArgs.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabViewExternalTornOutTabsDroppedEventArgs.cs
@@ -1,7 +1,7 @@
 // <auto-generated>
 #pragma warning disable 108 // new keyword hiding
 #pragma warning disable 114 // new keyword hiding
-namespace Microsoft.UI.Xaml.Controls
+namespace Microsoft/* UWP don't rename */.UI.Xaml.Controls
 {
 #if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
 	[global::Uno.NotImplemented]

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabViewExternalTornOutTabsDroppingEventArgs.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabViewExternalTornOutTabsDroppingEventArgs.cs
@@ -1,7 +1,7 @@
 // <auto-generated>
 #pragma warning disable 108 // new keyword hiding
 #pragma warning disable 114 // new keyword hiding
-namespace Microsoft.UI.Xaml.Controls
+namespace Microsoft/* UWP don't rename */.UI.Xaml.Controls
 {
 #if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
 	[global::Uno.NotImplemented]

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabViewItemAutomationPeer.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabViewItemAutomationPeer.cs
@@ -2,10 +2,9 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 // MUX Reference: TabViewItemAutomationPeer.cpp, commit 9349a0fbc
 
+using Microsoft.UI.Xaml.Automation.Provider;
 using Microsoft/* UWP don't rename */.UI.Xaml.Controls;
 using Uno.UI.Helpers.WinUI;
-using Microsoft.UI.Xaml.Automation.Peers;
-using Microsoft.UI.Xaml.Automation.Provider;
 
 namespace Microsoft/* UWP don't rename */.UI.Xaml.Automation.Peers;
 

diff --git a/.../Xaml/Controls/TabView/TabViewListView.cs → ...l/Controls/TabView/TabViewListView.mux.cs b/.../Xaml/Controls/TabView/TabViewListView.cs → ...l/Controls/TabView/TabViewListView.mux.cs
@@ -1,11 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
-// MUX Reference: TabViewListView.cpp, commit 4bab3245a
+// MUX Reference src\controls\dev\TabView\TabViewListView.cpp, commit d74a0332
 
-using Uno.UI.Helpers.WinUI;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
+using Uno.UI.Helpers.WinUI;
 
 namespace Microsoft/* UWP don't rename */.UI.Xaml.Controls.Primitives;
 
@@ -74,16 +72,24 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
 		// as they are already set correctly here.
 		//
 		// We know we are currently looking at a TabViewItem being recycled if its parent TabView has already been set.
-		if (tvi.GetParentTabView() == null)
+		var parentTabView = tvi.GetParentTabView();
+		if (parentTabView is null)
 		{
 			var tabView = SharedHelpers.GetAncestorOfType<TabView>(VisualTreeHelper.GetParent(this));
 			if (tabView != null)
 			{
 				tvi.OnTabViewWidthModeChanged(tabView.TabWidthMode);
 				tvi.SetParentTabView(tabView);
+
+				parentTabView = tabView;
 			}
 		}
 
+		if (parentTabView is not null)
+		{
+			parentTabView.UpdateTabWidths();
+		}
+
 		base.PrepareContainerForItemOverride(element, item);
 	}
 

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabViewTabTearOutRequestedEventArgs.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabViewTabTearOutRequestedEventArgs.cs
@@ -1,7 +1,7 @@
 // <auto-generated>
 #pragma warning disable 108 // new keyword hiding
 #pragma warning disable 114 // new keyword hiding
-namespace Microsoft.UI.Xaml.Controls
+namespace Microsoft/* UWP don't rename */.UI.Xaml.Controls
 {
 #if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
 	[global::Uno.NotImplemented]

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabViewTabTearOutWindowRequestedEventArgs.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabViewTabTearOutWindowRequestedEventArgs.cs
@@ -1,7 +1,7 @@
 // <auto-generated>
 #pragma warning disable 108 // new keyword hiding
 #pragma warning disable 114 // new keyword hiding
-namespace Microsoft.UI.Xaml.Controls
+namespace Microsoft/* UWP don't rename */.UI.Xaml.Controls
 {
 #if __ANDROID__ || __IOS__ || IS_UNIT_TESTS || __WASM__ || __SKIA__ || __NETSTD_REFERENCE__ || __MACOS__
 	[global::Uno.NotImplemented]