Skip to content

Commit 3b3ff02

Browse files
authored
Fix: Fixed issue where double clicking file would sometimes navigate up (#16119)
1 parent fcabe05 commit 3b3ff02

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -552,15 +552,11 @@ clickedItem is Microsoft.UI.Xaml.Shapes.Rectangle
552552
private async void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
553553
{
554554
// Skip opening selected items if the double tap doesn't capture an item
555-
if ((e.OriginalSource as FrameworkElement)?.DataContext is ListedItem item
556-
&& !UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
557-
{
555+
if ((e.OriginalSource as FrameworkElement)?.DataContext is ListedItem item && !UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
558556
await Commands.OpenItem.ExecuteAsync();
559-
}
560-
else if (UserSettingsService.FoldersSettingsService.DoubleClickToGoUp)
561-
{
557+
else if ((e.OriginalSource as FrameworkElement)?.DataContext is not ListedItem && UserSettingsService.FoldersSettingsService.DoubleClickToGoUp)
562558
await Commands.NavigateUp.ExecuteAsync();
563-
}
559+
564560
ResetRenameDoubleClick();
565561
}
566562

src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -585,10 +585,9 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
585585
private async void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
586586
{
587587
// Skip opening selected items if the double tap doesn't capture an item
588-
if ((e.OriginalSource as FrameworkElement)?.DataContext is ListedItem item &&
589-
!UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
588+
if ((e.OriginalSource as FrameworkElement)?.DataContext is ListedItem item && !UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
590589
await Commands.OpenItem.ExecuteAsync();
591-
else if (UserSettingsService.FoldersSettingsService.DoubleClickToGoUp)
590+
else if ((e.OriginalSource as FrameworkElement)?.DataContext is not ListedItem && UserSettingsService.FoldersSettingsService.DoubleClickToGoUp)
592591
await Commands.NavigateUp.ExecuteAsync();
593592

594593
ResetRenameDoubleClick();

0 commit comments

Comments
 (0)