Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Files.App/Actions/FileSystem/OpenItemAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ public HotKey HotKey
public bool IsExecutable =>
context.HasSelection &&
!(context.ShellPage is ColumnShellPage &&
context.SelectedItem?.PrimaryItemAttribute == StorageItemTypes.Folder);
context.SelectedItem?.PrimaryItemAttribute == StorageItemTypes.Folder) &&
context.PageType != ContentPageTypes.RecycleBin;

public OpenItemAction()
{
Expand Down Expand Up @@ -67,6 +68,7 @@ public RichGlyph Glyph

public bool IsExecutable =>
context.HasSelection &&
context.PageType != ContentPageTypes.RecycleBin &&
context.SelectedItems.All(i =>
(i.PrimaryItemAttribute == StorageItemTypes.File && !i.IsShortcut && !i.IsExecutable) ||
(i.PrimaryItemAttribute == StorageItemTypes.Folder && i.IsArchive));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public string Description
=> Strings.OpenDirectoryInNewPaneDescription.GetLocalizedResource();

public virtual bool IsExecutable =>
ContentPageContext.PageType != ContentPageTypes.RecycleBin &&
ContentPageContext.SelectedItem is not null &&
ContentPageContext.SelectedItem.IsFolder;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public virtual bool IsAccessibleGlobally
public virtual bool IsExecutable =>
ContentPageContext.ShellPage is not null &&
ContentPageContext.ShellPage.SlimContentPage is not null &&
ContentPageContext.PageType != ContentPageTypes.RecycleBin &&
ContentPageContext.SelectedItems.Count is not 0 &&
ContentPageContext.SelectedItems.Count <= 5 &&
ContentPageContext.SelectedItems.Count(x => x.IsFolder) == ContentPageContext.SelectedItems.Count;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public virtual bool IsAccessibleGlobally
public virtual bool IsExecutable =>
ContentPageContext.ShellPage is not null &&
ContentPageContext.ShellPage.SlimContentPage is not null &&
ContentPageContext.PageType != ContentPageTypes.RecycleBin &&
ContentPageContext.SelectedItems.Count is not 0 &&
ContentPageContext.SelectedItems.Count <= 5 &&
ContentPageContext.SelectedItems.Count(x => x.IsFolder) == ContentPageContext.SelectedItems.Count;
Expand Down
3 changes: 3 additions & 0 deletions src/Files.App/Actions/Sidebar/PinFolderToSidebarAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ public async Task ExecuteAsync(object? parameter = null)

private bool GetIsExecutable()
{
if (context.PageType == ContentPageTypes.RecycleBin)
return false;

string[] pinnedFolders = [.. App.QuickAccessManager.Model.PinnedFolders];

return context.HasSelection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
}.Build(),
new ContextMenuFlyoutItemViewModelBuilder(Commands.CreateFolderWithSelection)
{
IsVisible = UserSettingsService.GeneralSettingsService.ShowCreateFolderWithSelection && itemsSelected
IsVisible = UserSettingsService.GeneralSettingsService.ShowCreateFolderWithSelection && itemsSelected && !currentInstanceViewModel.IsPageTypeRecycleBin
}.Build(),
new ContextMenuFlyoutItemViewModelBuilder(Commands.CreateShortcut)
{
Expand Down
Loading