Fix: Init

Author: XTorLukas

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

@@ -228,7 +228,7 @@
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="*" />
-						<ColumnDefinition x:Name="RightPaddingColumn" Width="0" />
+						<ColumnDefinition x:Name="RightPaddingColumn" Width="{x:Bind TitleBarWidth, Mode=OneWay}" />
 					</Grid.ColumnDefinitions>
 
 					<!--  Height is not divisble by four in order to properly align the button  -->
@@ -260,7 +260,8 @@
 						Grid.ColumnSpan="2"
 						HorizontalAlignment="Stretch"
 						VerticalAlignment="Stretch"
-						Fill="Transparent" />
+						Fill="Transparent"
+						Loaded="DragAreaRectangle_Loaded" />
 
 				</Grid>
 			</TabView.TabStripFooter>

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

@@ -28,6 +28,8 @@ public sealed partial class TabBar : BaseTabBar, INotifyPropertyChanged
 
 		private bool _lockDropOperation = false;
 
+		private static int _gap = 6;
+
 		// Starting position when dragging a tab
 		private System.Drawing.Point dragStartPoint;
 
@@ -51,6 +53,14 @@ public bool AllowTabsDrag
 		public Rectangle DragArea
 			=> DragAreaRectangle;
 
+		private GridLength _titleBarWidth;
+
+		public GridLength TitleBarWidth
+		{
+			get => _titleBarWidth;
+			set => _titleBarWidth = new(value.Value + _gap);
+		}
+
 		// Events
 
 		public static event EventHandler<TabBarItem?>? SelectedTabItemChanged;
@@ -66,12 +76,10 @@ public TabBar()
 
 			var appWindow = MainWindow.Instance.AppWindow;
 
-			double rightPaddingColumnWidth =
-				FilePropertiesHelpers.FlowDirectionSettingIsRightToLeft
+			TitleBarWidth =
+				new(FilePropertiesHelpers.FlowDirectionSettingIsRightToLeft
 					? appWindow.TitleBar.LeftInset
-					: appWindow.TitleBar.RightInset;
-
-			RightPaddingColumn.Width = new(rightPaddingColumnWidth >= 0 ? rightPaddingColumnWidth : 0);
+					: appWindow.TitleBar.RightInset);
 
 			AppearanceSettingsService.PropertyChanged += (s, e) =>
 			{
@@ -366,5 +374,8 @@ private void TabViewItem_Loaded(object sender, RoutedEventArgs e)
 				});
 			}
 		}
+
+		private void DragAreaRectangle_Loaded(object sender, RoutedEventArgs e)
+			=> HorizontalTabView.Measure(new(HorizontalTabView.ActualWidth - TabBarAddNewTabButton.Width - TitleBarWidth.Value, HorizontalTabView.ActualHeight));
 	}
 }

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

@@ -126,7 +126,13 @@ private void UserSettingsService_OnSettingChangedEvent(object? sender, SettingCh
 
 		private void HorizontalMultitaskingControl_Loaded(object sender, RoutedEventArgs e)
 		{
-			TabControl.DragArea.SizeChanged += (_, _) => MainWindow.Instance.RaiseSetTitleBarDragRegion(SetTitleBarDragRegion);
+			TabControl.SizeChanged += TabControlArea_SizeChanged;
+			TabControl.DragArea.SizeChanged += TabControlArea_SizeChanged;
+		}
+
+		private void TabControlArea_SizeChanged(object sender, SizeChangedEventArgs e)
+		{
+			MainWindow.Instance.RaiseSetTitleBarDragRegion(SetTitleBarDragRegion);
 			if (ViewModel.MultitaskingControl is not TabBar)
 			{
 				ViewModel.MultitaskingControl = TabControl;
@@ -138,7 +144,9 @@ private void HorizontalMultitaskingControl_Loaded(object sender, RoutedEventArgs
 		private int SetTitleBarDragRegion(InputNonClientPointerSource source, SizeInt32 size, double scaleFactor, Func<UIElement, RectInt32?, RectInt32> getScaledRect)
 		{
 			var height = (int)TabControl.ActualHeight;
-			source.SetRegionRects(NonClientRegionKind.Passthrough, [getScaledRect(this, new RectInt32(0, 0, (int)(TabControl.ActualWidth + TabControl.Margin.Left - TabControl.DragArea.ActualWidth), height))]);
+			var width = (int)(TabControl.ActualWidth - TabControl.DragArea.ActualWidth);
+
+			source.SetRegionRects(NonClientRegionKind.Passthrough, [getScaledRect(this, new RectInt32(0, 0, width, height))]);
 			return height;
 		}