Skip to content

Commit 25c59f1

Browse files
authored
Fix: Fixed an issue where incorrect actions were displayed in the Recycle Bin context menu (#17813)
1 parent 7982242 commit 25c59f1

File tree

5 files changed

+9
-1
lines changed

5 files changed

+9
-1
lines changed

src/Files.App/Actions/FileSystem/OpenItemAction.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public HotKey HotKey
2727
public bool IsExecutable =>
2828
context.HasSelection &&
2929
!(context.ShellPage is ColumnShellPage &&
30-
context.SelectedItem?.PrimaryItemAttribute == StorageItemTypes.Folder);
30+
context.SelectedItem?.PrimaryItemAttribute == StorageItemTypes.Folder) &&
31+
context.PageType != ContentPageTypes.RecycleBin;
3132

3233
public OpenItemAction()
3334
{
@@ -67,6 +68,7 @@ public RichGlyph Glyph
6768

6869
public bool IsExecutable =>
6970
context.HasSelection &&
71+
context.PageType != ContentPageTypes.RecycleBin &&
7072
context.SelectedItems.All(i =>
7173
(i.PrimaryItemAttribute == StorageItemTypes.File && !i.IsShortcut && !i.IsExecutable) ||
7274
(i.PrimaryItemAttribute == StorageItemTypes.Folder && i.IsArchive));

src/Files.App/Actions/Navigation/OpenInNewPane/BaseOpenInNewPaneAction.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public string Description
1717
=> Strings.OpenDirectoryInNewPaneDescription.GetLocalizedResource();
1818

1919
public virtual bool IsExecutable =>
20+
ContentPageContext.PageType != ContentPageTypes.RecycleBin &&
2021
ContentPageContext.SelectedItem is not null &&
2122
ContentPageContext.SelectedItem.IsFolder;
2223

src/Files.App/Actions/Navigation/OpenInNewTab/BaseOpenInNewTabAction.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public virtual bool IsAccessibleGlobally
2525
public virtual bool IsExecutable =>
2626
ContentPageContext.ShellPage is not null &&
2727
ContentPageContext.ShellPage.SlimContentPage is not null &&
28+
ContentPageContext.PageType != ContentPageTypes.RecycleBin &&
2829
ContentPageContext.SelectedItems.Count is not 0 &&
2930
ContentPageContext.SelectedItems.Count <= 5 &&
3031
ContentPageContext.SelectedItems.Count(x => x.IsFolder) == ContentPageContext.SelectedItems.Count;

src/Files.App/Actions/Navigation/OpenInNewWindow/BaseOpenInNewWindowAction.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public virtual bool IsAccessibleGlobally
3030
public virtual bool IsExecutable =>
3131
ContentPageContext.ShellPage is not null &&
3232
ContentPageContext.ShellPage.SlimContentPage is not null &&
33+
ContentPageContext.PageType != ContentPageTypes.RecycleBin &&
3334
ContentPageContext.SelectedItems.Count is not 0 &&
3435
ContentPageContext.SelectedItems.Count <= 5 &&
3536
ContentPageContext.SelectedItems.Count(x => x.IsFolder) == ContentPageContext.SelectedItems.Count;

src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ public async Task ExecuteAsync(object? parameter = null)
4848

4949
private bool GetIsExecutable()
5050
{
51+
if (context.PageType == ContentPageTypes.RecycleBin)
52+
return false;
53+
5154
string[] pinnedFolders = [.. App.QuickAccessManager.Model.PinnedFolders];
5255

5356
return context.HasSelection

0 commit comments

Comments
 (0)