Skip to content

Commit eed2edf

Browse files
authored
Open new columns in the column layout on a single click (#7470)
1 parent f2b8c62 commit eed2edf

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

src/Files/Views/LayoutModes/ColumnViewBase.xaml.cs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System;
99
using System.Collections.Generic;
1010
using System.Linq;
11-
using System.Threading.Tasks;
1211
using Windows.Storage;
1312
using Windows.System;
1413
using Windows.UI.Core;
@@ -417,17 +416,9 @@ private void FileList_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
417416
{
418417
var clickedItem = e.OriginalSource as FrameworkElement;
419418
if (clickedItem?.DataContext is ListedItem item
420-
&& ((!UserSettingsService.PreferencesSettingsService.OpenFilesWithOneClick && item.PrimaryItemAttribute == StorageItemTypes.File)
421-
|| (!UserSettingsService.PreferencesSettingsService.OpenFoldersWithOneClick && item.PrimaryItemAttribute == StorageItemTypes.Folder)))
419+
&& !UserSettingsService.PreferencesSettingsService.OpenFilesWithOneClick && item.PrimaryItemAttribute == StorageItemTypes.File)
422420
{
423-
if (item.PrimaryItemAttribute == StorageItemTypes.Folder)
424-
{
425-
ItemInvoked?.Invoke(new ColumnParam { NavPathParam = (item is ShortcutItem sht ? sht.TargetPath : item.ItemPath), ListView = FileList }, EventArgs.Empty);
426-
}
427-
else
428-
{
429-
NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
430-
}
421+
NavigationHelpers.OpenSelectedItems(ParentShellPageInstance, false);
431422
}
432423

433424
ResetRenameDoubleClick();
@@ -472,7 +463,7 @@ private void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
472463
}
473464
// Check if the setting to open items with a single click is turned on
474465
if (item != null
475-
&& ((UserSettingsService.PreferencesSettingsService.OpenFoldersWithOneClick && item.PrimaryItemAttribute == StorageItemTypes.Folder) || (UserSettingsService.PreferencesSettingsService.OpenFilesWithOneClick && item.PrimaryItemAttribute == StorageItemTypes.File)))
466+
&& ((item.PrimaryItemAttribute == StorageItemTypes.Folder) || (UserSettingsService.PreferencesSettingsService.OpenFilesWithOneClick && item.PrimaryItemAttribute == StorageItemTypes.File)))
476467
{
477468
ResetRenameDoubleClick();
478469

0 commit comments

Comments
 (0)