Skip to content

Commit cdea7e8

Browse files
committed
Fix: Enable handling of multiple item selection with Enter key in Details/Search Result view (from Columns view)
1 parent 44c365a commit cdea7e8

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -458,24 +458,29 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
458458

459459
if (ctrlPressed && !shiftPressed)
460460
{
461-
var folders = ParentShellPageInstance?.SlimContentPage.SelectedItems?.Where(file => file.PrimaryItemAttribute == StorageItemTypes.Folder);
462-
if (folders is not null)
461+
var folders = SelectedItems?.Where(file => file.PrimaryItemAttribute == StorageItemTypes.Folder);
462+
if (folders?.Any() ?? false)
463463
{
464464
foreach (ListedItem folder in folders)
465465
await NavigationHelpers.OpenPathInNewTab(folder.ItemPath);
466466
}
467467
}
468468
else if (ctrlPressed && shiftPressed)
469469
{
470-
var selectedFolder = SelectedItems?.FirstOrDefault(item => item.PrimaryItemAttribute == StorageItemTypes.Folder);
471-
if (selectedFolder is not null)
472-
NavigationHelpers.OpenInSecondaryPane(ParentShellPageInstance, selectedFolder);
470+
var selectedFolders = SelectedItems?.Where(item => item.PrimaryItemAttribute == StorageItemTypes.Folder);
471+
if (selectedFolders?.Any() ?? false)
472+
{
473+
foreach (var selectedFolder in selectedFolders)
474+
NavigationHelpers.OpenInSecondaryPane(ParentShellPageInstance, selectedFolder);
475+
}
473476
}
474477
else if (!ctrlPressed && !shiftPressed && !UserSettingsService.FoldersSettingsService.OpenItemsWithOneClick)
475478
{
476-
var selectedItem = SelectedItems?.FirstOrDefault();
477-
if (selectedItem != null)
478-
await OpenItem(selectedItem);
479+
if (SelectedItems?.Any() ?? false)
480+
{
481+
foreach (var selectedItem in SelectedItems)
482+
await OpenItem(selectedItem);
483+
}
479484
}
480485
}
481486
else if (e.Key == VirtualKey.Enter && e.KeyStatus.IsMenuKeyDown)

0 commit comments

Comments
 (0)