Skip to content

Commit 11d6a17

Browse files
committed
Fix: Hidden inappropriate context menu items for Recycle Bin.
1 parent 5ddc007 commit 11d6a17

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,10 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
380380
{
381381
IsVisible = currentInstanceViewModel.IsPageTypeRecycleBin && itemsSelected,
382382
}.Build(),
383-
new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenItem).Build(),
383+
new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenItem)
384+
{
385+
IsVisible = !areAllItemsFolders
386+
}.Build(),
384387
new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenItemWithApplicationPicker)
385388
{
386389
Tag = "OpenWith",
@@ -409,15 +412,15 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
409412
new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenFileLocation).Build(),
410413
new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewTab)
411414
{
412-
IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && Commands.OpenInNewTab.IsExecutable
415+
IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && Commands.OpenInNewTab.IsExecutable && !currentInstanceViewModel.IsPageTypeRecycleBin
413416
}.Build(),
414417
new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewWindow)
415418
{
416-
IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && Commands.OpenInNewWindow.IsExecutable
419+
IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && Commands.OpenInNewWindow.IsExecutable && !currentInstanceViewModel.IsPageTypeRecycleBin
417420
}.Build(),
418421
new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewPane)
419422
{
420-
IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && Commands.OpenInNewPane.IsExecutable
423+
IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && Commands.OpenInNewPane.IsExecutable && !currentInstanceViewModel.IsPageTypeRecycleBin
421424
}.Build(),
422425
new ContextMenuFlyoutItemViewModel()
423426
{
@@ -479,7 +482,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
479482
}.Build(),
480483
new ContextMenuFlyoutItemViewModelBuilder(Commands.CreateFolderWithSelection)
481484
{
482-
IsVisible = UserSettingsService.GeneralSettingsService.ShowCreateFolderWithSelection && itemsSelected
485+
IsVisible = UserSettingsService.GeneralSettingsService.ShowCreateFolderWithSelection && itemsSelected && !currentInstanceViewModel.IsPageTypeRecycleBin
483486
}.Build(),
484487
new ContextMenuFlyoutItemViewModelBuilder(Commands.CreateShortcut)
485488
{

0 commit comments

Comments
 (0)