From 23248e27193d1c1524004ad4d1fd2b52d4176b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?La=C5=A1t=C5=AFvka=20Luk=C3=A1=C5=A1?= Date: Wed, 29 May 2024 01:10:56 +0200 Subject: [PATCH 1/5] Fix: Adding touch management --- src/Files.App/Views/PaneHolderPage.xaml.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Files.App/Views/PaneHolderPage.xaml.cs b/src/Files.App/Views/PaneHolderPage.xaml.cs index 28501abe0c43..394554915089 100644 --- a/src/Files.App/Views/PaneHolderPage.xaml.cs +++ b/src/Files.App/Views/PaneHolderPage.xaml.cs @@ -335,6 +335,12 @@ private void Pane_Loaded(object sender, RoutedEventArgs e) { ((UIElement)sender).GotFocus += Pane_GotFocus; ((UIElement)sender).RightTapped += Pane_RightTapped; + ((UIElement)sender).PointerPressed += Pane_PointerPressed; + } + + private void Pane_PointerPressed(object sender, PointerRoutedEventArgs e) + { + Pane_GotFocus(sender, new()); } private void Pane_GotFocus(object sender, RoutedEventArgs e) From 125d39a03e609d2632e1e782119f0596e2e52672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?La=C5=A1t=C5=AFvka=20Luk=C3=A1=C5=A1?= Date: Wed, 29 May 2024 01:55:36 +0200 Subject: [PATCH 2/5] Fix: Focus change correctly --- src/Files.App/Views/PaneHolderPage.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Files.App/Views/PaneHolderPage.xaml.cs b/src/Files.App/Views/PaneHolderPage.xaml.cs index 394554915089..cc76ad5349be 100644 --- a/src/Files.App/Views/PaneHolderPage.xaml.cs +++ b/src/Files.App/Views/PaneHolderPage.xaml.cs @@ -340,7 +340,7 @@ private void Pane_Loaded(object sender, RoutedEventArgs e) private void Pane_PointerPressed(object sender, PointerRoutedEventArgs e) { - Pane_GotFocus(sender, new()); + ((UIElement)sender).Focus(FocusState.Pointer); } private void Pane_GotFocus(object sender, RoutedEventArgs e) From ae68d668fb464f5ff5b1d0c86ef652e9c8e312a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?La=C5=A1t=C5=AFvka=20Luk=C3=A1=C5=A1?= Date: Wed, 29 May 2024 02:05:03 +0200 Subject: [PATCH 3/5] CQ: Format --- src/Files.App/Views/PaneHolderPage.xaml.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Files.App/Views/PaneHolderPage.xaml.cs b/src/Files.App/Views/PaneHolderPage.xaml.cs index cc76ad5349be..fcc058a4159f 100644 --- a/src/Files.App/Views/PaneHolderPage.xaml.cs +++ b/src/Files.App/Views/PaneHolderPage.xaml.cs @@ -339,9 +339,7 @@ private void Pane_Loaded(object sender, RoutedEventArgs e) } private void Pane_PointerPressed(object sender, PointerRoutedEventArgs e) - { - ((UIElement)sender).Focus(FocusState.Pointer); - } + => ((UIElement)sender).Focus(FocusState.Pointer); private void Pane_GotFocus(object sender, RoutedEventArgs e) { From 87a9685f65415e8ab85be4b354c983101ef33c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20La=C5=A1t=C5=AFvka?= Date: Fri, 31 May 2024 15:12:32 +0200 Subject: [PATCH 4/5] CQ: Reaction to touch only --- src/Files.App/Views/PaneHolderPage.xaml.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Files.App/Views/PaneHolderPage.xaml.cs b/src/Files.App/Views/PaneHolderPage.xaml.cs index fcc058a4159f..7c347920b3f1 100644 --- a/src/Files.App/Views/PaneHolderPage.xaml.cs +++ b/src/Files.App/Views/PaneHolderPage.xaml.cs @@ -335,11 +335,14 @@ private void Pane_Loaded(object sender, RoutedEventArgs e) { ((UIElement)sender).GotFocus += Pane_GotFocus; ((UIElement)sender).RightTapped += Pane_RightTapped; - ((UIElement)sender).PointerPressed += Pane_PointerPressed; + ((UIElement)sender).Tapped += Pane_Tapped; } - private void Pane_PointerPressed(object sender, PointerRoutedEventArgs e) - => ((UIElement)sender).Focus(FocusState.Pointer); + private void Pane_Tapped(object sender, TappedRoutedEventArgs e) + { + if (e.PointerDeviceType == PointerDeviceType.Touch) + (sender as UIElement)?.Focus(FocusState.Pointer); + } private void Pane_GotFocus(object sender, RoutedEventArgs e) { From adc224a75ca4ccec4b988157bd42f3809c64605d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20La=C5=A1t=C5=AFvka?= Date: Fri, 31 May 2024 15:23:10 +0200 Subject: [PATCH 5/5] CQ: Use PointerPressed --- src/Files.App/Views/PaneHolderPage.xaml.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/Files.App/Views/PaneHolderPage.xaml.cs b/src/Files.App/Views/PaneHolderPage.xaml.cs index 7c347920b3f1..6e7d489201d9 100644 --- a/src/Files.App/Views/PaneHolderPage.xaml.cs +++ b/src/Files.App/Views/PaneHolderPage.xaml.cs @@ -335,14 +335,11 @@ private void Pane_Loaded(object sender, RoutedEventArgs e) { ((UIElement)sender).GotFocus += Pane_GotFocus; ((UIElement)sender).RightTapped += Pane_RightTapped; - ((UIElement)sender).Tapped += Pane_Tapped; + ((UIElement)sender).PointerPressed += Pane_PointerPressed; } - private void Pane_Tapped(object sender, TappedRoutedEventArgs e) - { - if (e.PointerDeviceType == PointerDeviceType.Touch) - (sender as UIElement)?.Focus(FocusState.Pointer); - } + private void Pane_PointerPressed(object sender, PointerRoutedEventArgs e) + => (sender as UIElement)?.Focus(FocusState.Pointer); private void Pane_GotFocus(object sender, RoutedEventArgs e) {