CQ: Fix MainPropertiesPage drag area for RTL

XTorLukas · XTorLukas · commit 05b304658b79 · 2024-12-02T14:28:15.000+01:00
diff --git a/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs b/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
@@ -67,8 +67,12 @@ private void Page_Loaded(object sender, RoutedEventArgs e)
 
 		private int SetTitleBarDragRegion(InputNonClientPointerSource source, SizeInt32 size, double scaleFactor, Func<UIElement, RectInt32?, RectInt32> getScaledRect)
 		{
-			source.SetRegionRects(NonClientRegionKind.Passthrough, [getScaledRect(BackwardNavigationButton, null)]);
-			return (int)TitlebarArea.ActualHeight;
+			var height = (int)TitlebarArea.ActualHeight;
+			var x = RealTimeLayoutService.FlowDirection == FlowDirection.LeftToRight ? 0 : (int)((TitleDragArea.ActualWidth + 50) * scaleFactor);
+			var width = (int)((BackwardNavigationButton.ActualWidth + 2) * scaleFactor);
+
+			source.SetRegionRects(NonClientRegionKind.Passthrough, [getScaledRect(BackwardNavigationButton, new RectInt32(x, 0, width, height))]);
+			return height;
 		}
 
 		private void Page_SizeChanged(object sender, SizeChangedEventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,12 @@ private void Page_Loaded(object sender, RoutedEventArgs e)`
`67`	`67`
`68`	`68`	`private int SetTitleBarDragRegion(InputNonClientPointerSource source, SizeInt32 size, double scaleFactor, Func<UIElement, RectInt32?, RectInt32> getScaledRect)`
`69`	`69`	`{`
`70`		`- source.SetRegionRects(NonClientRegionKind.Passthrough, [getScaledRect(BackwardNavigationButton, null)]);`
`71`		`- return (int)TitlebarArea.ActualHeight;`
	`70`	`+ var height = (int)TitlebarArea.ActualHeight;`
	`71`	`+ var x = RealTimeLayoutService.FlowDirection == FlowDirection.LeftToRight ? 0 : (int)((TitleDragArea.ActualWidth + 50) * scaleFactor);`
	`72`	`+ var width = (int)((BackwardNavigationButton.ActualWidth + 2) * scaleFactor);`
	`73`	`+`
	`74`	`+ source.SetRegionRects(NonClientRegionKind.Passthrough, [getScaledRect(BackwardNavigationButton, new RectInt32(x, 0, width, height))]);`
	`75`	`+ return height;`
`72`	`76`	`}`
`73`	`77`
`74`	`78`	`private void Page_SizeChanged(object sender, SizeChangedEventArgs e)`