CQ: Fix

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 PaddingColumnWidth, Mode=OneWay}" />
 					</Grid.ColumnDefinitions>
 
 					<!--  Height is not divisble by four in order to properly align the button  -->
@@ -237,6 +237,7 @@
 						Grid.Column="0"
 						Width="30"
 						Height="30"
+						Margin="0,0,6,0"
 						Padding="8"
 						HorizontalAlignment="Left"
 						VerticalAlignment="Center"

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

@@ -19,6 +19,7 @@ public sealed partial class TabBar : BaseTabBar, INotifyPropertyChanged
 		private readonly ICommandManager Commands = Ioc.Default.GetRequiredService<ICommandManager>();
 		private readonly IAppearanceSettingsService AppearanceSettingsService = Ioc.Default.GetRequiredService<IAppearanceSettingsService>();
 		private readonly IWindowContext WindowContext = Ioc.Default.GetRequiredService<IWindowContext>();
+		private readonly IRealTimeLayoutService RealTimeLayoutService = Ioc.Default.GetRequiredService<IRealTimeLayoutService>();
 
 		// Fields
 
@@ -51,6 +52,8 @@ public bool AllowTabsDrag
 		public Rectangle DragArea
 			=> DragAreaRectangle;
 
+		public GridLength PaddingColumnWidth { get; set; }
+
 		// Events
 
 		public static event EventHandler<TabBarItem?>? SelectedTabItemChanged;
@@ -66,12 +69,10 @@ public TabBar()
 
 			var appWindow = MainWindow.Instance.AppWindow;
 
-			double rightPaddingColumnWidth =
-				FilePropertiesHelpers.FlowDirectionSettingIsRightToLeft
+			PaddingColumnWidth =
+				new(RealTimeLayoutService.FlowDirection is FlowDirection.RightToLeft
 					? appWindow.TitleBar.LeftInset
-					: appWindow.TitleBar.RightInset;
-
-			RightPaddingColumn.Width = new(rightPaddingColumnWidth >= 0 ? rightPaddingColumnWidth : 0);
+					: appWindow.TitleBar.RightInset);
 
 			AppearanceSettingsService.PropertyChanged += (s, e) =>
 			{

src/Files.App/Utils/Storage/Helpers/FilePropertiesHelpers.cs

@@ -23,12 +23,6 @@ public static class FilePropertiesHelpers
 
 		private static IRealTimeLayoutService RealTimeLayoutService { get; } = Ioc.Default.GetRequiredService<IRealTimeLayoutService>();
 
-		/// <summary>
-		/// Whether LayoutDirection (FlowDirection) is set to right-to-left (RTL)
-		/// </summary>
-		public static readonly bool FlowDirectionSettingIsRightToLeft =
-			new ResourceManager().CreateResourceContext().QualifierValues["LayoutDirection"] == "RTL";
-
 		/// <summary>
 		/// Get window handle (hWnd) of the given properties window instance
 		/// </summary>

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

@@ -26,6 +26,7 @@ public sealed partial class MainPage : Page
 		private IGeneralSettingsService generalSettingsService { get; } = Ioc.Default.GetRequiredService<IGeneralSettingsService>();
 		public IUserSettingsService UserSettingsService { get; }
 		private readonly IWindowContext WindowContext = Ioc.Default.GetRequiredService<IWindowContext>();
+		private readonly IRealTimeLayoutService RealTimeLayoutService = Ioc.Default.GetRequiredService<IRealTimeLayoutService>();
 		public ICommandManager Commands { get; }
 		public SidebarViewModel SidebarAdaptiveViewModel { get; }
 		public MainPageViewModel ViewModel { get; }
@@ -47,9 +48,6 @@ public MainPage()
 			ViewModel = Ioc.Default.GetRequiredService<MainPageViewModel>();
 			OngoingTasksViewModel = Ioc.Default.GetRequiredService<StatusCenterViewModel>();
 
-			if (FilePropertiesHelpers.FlowDirectionSettingIsRightToLeft)
-				FlowDirection = FlowDirection.RightToLeft;
-
 			ViewModel.PropertyChanged += ViewModel_PropertyChanged;
 			UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
 
@@ -137,9 +135,8 @@ private void HorizontalMultitaskingControl_Loaded(object sender, RoutedEventArgs
 
 		private int SetTitleBarDragRegion(InputNonClientPointerSource source, SizeInt32 size, double scaleFactor, Func<UIElement, RectInt32?, RectInt32> getScaledRect)
 		{
-			var rtls = Ioc.Default.GetRequiredService<IRealTimeLayoutService>();
 			var height = (int)TabControl.ActualHeight;
-			var x = rtls.FlowDirection == FlowDirection.LeftToRight ? 0 : (int)TabControl.ActualWidth;
+			var x = RealTimeLayoutService.FlowDirection == FlowDirection.LeftToRight ? 0 : (int)TabControl.ActualWidth;
 			var width = (int)(TabControl.ActualWidth + TabControl.Margin.Left - TabControl.DragArea.ActualWidth);
 
 			source.SetRegionRects(NonClientRegionKind.Passthrough, [getScaledRect(this, new RectInt32(x, 0, width, height))]);

src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs

@@ -29,9 +29,6 @@ public MainPropertiesPage()
 		{
 			InitializeComponent();
 			InitializeContentLayout();
-
-			if (FilePropertiesHelpers.FlowDirectionSettingIsRightToLeft)
-				FlowDirection = FlowDirection.RightToLeft;
 		}
 
 

src/Files.App/Views/Shells/BaseShellPage.cs

@@ -176,9 +176,6 @@ public BaseShellPage(CurrentInstanceViewModel instanceViewModel)
 
 			DisplayFilesystemConsentDialogAsync();
 
-			if (FilePropertiesHelpers.FlowDirectionSettingIsRightToLeft)
-				FlowDirection = FlowDirection.RightToLeft;
-
 			ToolbarViewModel.ToolbarPathItemInvoked += ShellPage_NavigationRequested;
 			ToolbarViewModel.ToolbarFlyoutOpened += ShellPage_ToolbarFlyoutOpened;
 			ToolbarViewModel.ToolbarPathItemLoaded += ShellPage_ToolbarPathItemLoaded;