CQ: Move to TabBar

Author: XTorLukas

src/Files.App/UserControls/TabBar/TabBar.xaml

@@ -11,6 +11,7 @@
 	xmlns:root="using:Files.App"
 	xmlns:uc="using:Files.App.UserControls"
 	xmlns:wctconverters="using:CommunityToolkit.WinUI.UI.Converters"
+	Loaded="BaseTabBar_Loaded"
 	mc:Ignorable="d">
 
 	<local:BaseTabBar.Resources>

src/Files.App/UserControls/TabBar/TabBar.xaml.cs

@@ -2,11 +2,13 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using CommunityToolkit.WinUI.UI;
+using Microsoft.UI.Input;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Shapes;
 using Windows.ApplicationModel.DataTransfer;
+using Windows.Graphics;
 using Windows.Storage;
 using Windows.Win32;
 
@@ -65,6 +67,8 @@ public GridLength TitleBarWidth
 
 		public static event EventHandler<TabBarItem?>? SelectedTabItemChanged;
 
+		public event EventHandler<SizeChangedEventArgs>? TabControlAreaSizeChanged;
+
 		// Constructor
 
 		public TabBar()
@@ -92,6 +96,9 @@ public TabBar()
 			};
 		}
 
+		private void BaseTabBar_Loaded(object sender, RoutedEventArgs e)
+			=> MainWindow.Instance.AppWindow.Changed += (_, _) => MainWindow.Instance.RaiseSetTitleBarDragRegion(SetTitleBarDragRegion);
+
 		private void TabView_TabItemsChanged(TabView sender, Windows.Foundation.Collections.IVectorChangedEventArgs args)
 		{
 			if (args.CollectionChange == Windows.Foundation.Collections.CollectionChange.ItemRemoved)
@@ -380,6 +387,19 @@ private void DragAreaRectangle_Loaded(object sender, RoutedEventArgs e)
 			var width = HorizontalTabView.ActualWidth - TabBarAddNewTabButton.Width - TitleBarWidth.Value;
 			var height = HorizontalTabView.ActualHeight;
 			HorizontalTabView.Measure(new(width >= 0 ? width : 0, height >= 0 ? height : 0));
+
+			MainWindow.Instance.RaiseSetTitleBarDragRegion(SetTitleBarDragRegion);
+			SizeChanged += (s, e) => TabControlAreaSizeChanged?.Invoke(s, e);
+			DragArea.SizeChanged += (s, e) => TabControlAreaSizeChanged?.Invoke(s, e);
+		}
+
+		private int SetTitleBarDragRegion(InputNonClientPointerSource source, SizeInt32 size, double scaleFactor, Func<UIElement, RectInt32?, RectInt32> getScaledRect)
+		{
+			var height = (int)ActualHeight;
+			var width = (int)(ActualWidth - DragArea.ActualWidth);
+
+			source.SetRegionRects(NonClientRegionKind.Passthrough, [getScaledRect(this, new RectInt32(0, 0, width, height))]);
+			return height;
 		}
 	}
 }

src/Files.App/Views/MainPage.xaml.cs

@@ -125,14 +125,10 @@ private void UserSettingsService_OnSettingChangedEvent(object? sender, SettingCh
 		}
 
 		private void HorizontalMultitaskingControl_Loaded(object sender, RoutedEventArgs e)
-		{
-			TabControl.SizeChanged += TabControlArea_SizeChanged;
-			TabControl.DragArea.SizeChanged += TabControlArea_SizeChanged;
-		}
+			=> TabControl.TabControlAreaSizeChanged += TabControlArea_SizeChanged;
 
 		private void TabControlArea_SizeChanged(object sender, SizeChangedEventArgs e)
 		{
-			MainWindow.Instance.RaiseSetTitleBarDragRegion(SetTitleBarDragRegion);
 			if (ViewModel.MultitaskingControl is not TabBar)
 			{
 				ViewModel.MultitaskingControl = TabControl;
@@ -141,15 +137,6 @@ private void TabControlArea_SizeChanged(object sender, SizeChangedEventArgs e)
 			}
 		}
 
-		private int SetTitleBarDragRegion(InputNonClientPointerSource source, SizeInt32 size, double scaleFactor, Func<UIElement, RectInt32?, RectInt32> getScaledRect)
-		{
-			var height = (int)TabControl.ActualHeight;
-			var width = (int)(TabControl.ActualWidth - TabControl.DragArea.ActualWidth);
-
-			source.SetRegionRects(NonClientRegionKind.Passthrough, [getScaledRect(this, new RectInt32(0, 0, width, height))]);
-			return height;
-		}
-
 		public async void TabItemContent_ContentChanged(object? sender, TabBarItemParameter e)
 		{
 			if (SidebarAdaptiveViewModel.PaneHolder is null)
@@ -287,8 +274,6 @@ protected override void OnLostFocus(RoutedEventArgs e)
 
 		private void Page_Loaded(object sender, RoutedEventArgs e)
 		{
-			MainWindow.Instance.AppWindow.Changed += (_, _) => MainWindow.Instance.RaiseSetTitleBarDragRegion(SetTitleBarDragRegion);
-
 			// Defers the status bar loading until after the page has loaded to improve startup perf
 			FindName(nameof(StatusBar));
 			FindName(nameof(InnerNavigationToolbar));