From 3c2f124aa376c4f56357e9c2cf502f694aabb2fb Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Fri, 20 Dec 2024 20:51:17 +0100 Subject: [PATCH] Fix: Right clicking a file displays disabled options to open in new tab/pane/window --- .../Data/Factories/ContentPageContextFlyoutFactory.cs | 6 +++--- src/Files.App/ViewModels/UserControls/SidebarViewModel.cs | 6 +++--- .../UserControls/Widgets/DrivesWidgetViewModel.cs | 6 +++--- .../UserControls/Widgets/FileTagsWidgetViewModel.cs | 6 +++--- .../UserControls/Widgets/NetworkLocationsWidgetViewModel.cs | 6 +++--- .../UserControls/Widgets/QuickAccessWidgetViewModel.cs | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs index 2c282955ac97..5eb5c4cf43e5 100644 --- a/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs +++ b/src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs @@ -409,15 +409,15 @@ public static List GetBaseItemMenuItems( new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenFileLocation).Build(), new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewTabAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && Commands.OpenInNewTabAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewWindowAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && Commands.OpenInNewWindowAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewPaneAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && Commands.OpenInNewPaneAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModel() { diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs index 94c38f28d0a1..cdea49b4f614 100644 --- a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs @@ -961,15 +961,15 @@ private List GetLocationItemMenuItems(INavigatio }.Build(), new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewTabFromSidebarAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && Commands.OpenInNewTabFromSidebarAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewWindowFromSidebarAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && Commands.OpenInNewWindowFromSidebarAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModelBuilder(Commands.OpenInNewPaneFromSidebarAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && Commands.OpenInNewPaneFromSidebarAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModel() { diff --git a/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs index 8cdb77246fd1..9bd9d27a7236 100644 --- a/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs @@ -90,15 +90,15 @@ public override List GetItemMenuItems(WidgetCard { new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewTabFromHomeAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && CommandManager.OpenInNewTabFromHomeAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewWindowFromHomeAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && CommandManager.OpenInNewWindowFromHomeAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewPaneFromHomeAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && CommandManager.OpenInNewPaneFromHomeAction.IsExecutable }.Build(), new() { diff --git a/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs index cc1d12013c18..2f822078c8e1 100644 --- a/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs @@ -68,15 +68,15 @@ public override List GetItemMenuItems(WidgetCard { new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewTabFromHomeAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && CommandManager.OpenInNewTabFromHomeAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewWindowFromHomeAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && CommandManager.OpenInNewWindowFromHomeAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewPaneFromHomeAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && CommandManager.OpenInNewPaneFromHomeAction.IsExecutable }.Build(), new() { diff --git a/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs index 09169db0ece2..d56bafa39634 100644 --- a/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/Widgets/NetworkLocationsWidgetViewModel.cs @@ -103,15 +103,15 @@ public override List GetItemMenuItems(WidgetCard { new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewTabFromHomeAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && CommandManager.OpenInNewTabFromHomeAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewWindowFromHomeAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && CommandManager.OpenInNewWindowFromHomeAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewPaneFromHomeAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && CommandManager.OpenInNewPaneFromHomeAction.IsExecutable }.Build(), new() { diff --git a/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs index 9c5b02357b20..0833679f07eb 100644 --- a/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs @@ -62,15 +62,15 @@ public override List GetItemMenuItems(WidgetCard { new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewTabFromHomeAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewTab && CommandManager.OpenInNewTabFromHomeAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewWindowFromHomeAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewWindow && CommandManager.OpenInNewWindowFromHomeAction.IsExecutable }.Build(), new ContextMenuFlyoutItemViewModelBuilder(CommandManager.OpenInNewPaneFromHomeAction) { - IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane + IsVisible = UserSettingsService.GeneralSettingsService.ShowOpenInNewPane && CommandManager.OpenInNewPaneFromHomeAction.IsExecutable }.Build(), new() {