Fix: Fixed an issue which caused unexpected scrolling in the Columns Layout (#16638)

gave92 · web-flow · commit 71da43501802 · 2024-12-21T22:16:23.000-05:00
diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs
@@ -646,7 +646,8 @@ private void Pane_ContentChanged(object? sender, TabBarItemParameter e)
 
 		private void Pane_PointerPressed(object sender, PointerRoutedEventArgs e)
 		{
-			(sender as UIElement)?.Focus(FocusState.Pointer);
+			if (sender != ActivePane && sender is IShellPage shellPage && shellPage.SlimContentPage is not ColumnsLayoutPage)
+				(sender as UIElement)?.Focus(FocusState.Pointer);
 		}
 
 		private void Pane_GotFocus(object sender, RoutedEventArgs e)

Original file line number	Diff line number	Diff line change
`@@ -646,7 +646,8 @@ private void Pane_ContentChanged(object? sender, TabBarItemParameter e)`
`646`	`646`
`647`	`647`	`private void Pane_PointerPressed(object sender, PointerRoutedEventArgs e)`
`648`	`648`	`{`
`649`		`- (sender as UIElement)?.Focus(FocusState.Pointer);`
	`649`	`+ if (sender != ActivePane && sender is IShellPage shellPage && shellPage.SlimContentPage is not ColumnsLayoutPage)`
	`650`	`+ (sender as UIElement)?.Focus(FocusState.Pointer);`
`650`	`651`	`}`
`651`	`652`
`652`	`653`	`private void Pane_GotFocus(object sender, RoutedEventArgs e)`