Code Quality: Fixed issue where run settings were shown for folders

files-community · Jan 12, 2025 · 306be87 · 306be87
1 parent 9d88cf5
commit 306be87
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs b/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs
@@ -635,6 +635,13 @@ public bool ShortcutItemArgumentsVisibility
 			get => shortcutItemArgumentsVisibility;
 			set => SetProperty(ref shortcutItemArgumentsVisibility, value);
 		}
+
+		private bool shortcutItemWindowArgsVisibility = false;
+		public bool ShortcutItemWindowArgsVisibility
+		{
+			get => shortcutItemWindowArgsVisibility;
+			set => SetProperty(ref shortcutItemWindowArgsVisibility, value);
+		}
 
 		private RelayCommand shortcutItemOpenLinkCommand;
 		public RelayCommand ShortcutItemOpenLinkCommand

diff --git a/src/Files.App/ViewModels/Properties/Items/FileProperties.cs b/src/Files.App/ViewModels/Properties/Items/FileProperties.cs
@@ -67,6 +67,7 @@ public override void GetBaseProperties()
 			ViewModel.ShortcutItemArguments = shortcutItem.Arguments;
 			ViewModel.ShowWindowCommand = shortcutItem.ShowWindowCommand;
 			ViewModel.ShortcutItemArgumentsVisibility = Item.IsLinkItem || shortcutItem.IsSymLink ? false : true;
+			ViewModel.ShortcutItemWindowArgsVisibility = Item.IsLinkItem || shortcutItem.IsSymLink ? false : true;
 
 			if (isApplication)
 				ViewModel.RunAsAdmin = shortcutItem.RunAsAdmin;

diff --git a/src/Files.App/ViewModels/Properties/Items/FolderProperties.cs b/src/Files.App/ViewModels/Properties/Items/FolderProperties.cs
@@ -59,6 +59,7 @@ public override void GetBaseProperties()
 					ViewModel.ShortcutItemWorkingDirVisibility = false;
 					ViewModel.ShortcutItemArguments = shortcutItem.Arguments;
 					ViewModel.ShortcutItemArgumentsVisibility = false;
+					ViewModel.ShortcutItemWindowArgsVisibility = false;
 					ViewModel.ShortcutItemOpenLinkCommand = new RelayCommand(async () =>
 					{
 						await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(

diff --git a/src/Files.App/Views/Properties/ShortcutPage.xaml b/src/Files.App/Views/Properties/ShortcutPage.xaml
@@ -137,7 +137,10 @@
 					Text="{x:Bind ViewModel.ShortcutItemWorkingDirEditedValue, Mode=TwoWay}" />
 			</Grid>
 
-			<settingsuc:SettingsBlockControl Title="{helpers:ResourceString Name=StartWindow}" HorizontalAlignment="Stretch">
+			<settingsuc:SettingsBlockControl
+				Title="{helpers:ResourceString Name=StartWindow}"
+				HorizontalAlignment="Stretch"
+				x:Load="{x:Bind ViewModel.ShortcutItemWindowArgsVisibility, Mode=OneWay}">
 				<ComboBox ItemsSource="{x:Bind ViewModel.ShowWindowCommandTypes.Values, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedShowWindowCommand, Mode=TwoWay}" />
 			</settingsuc:SettingsBlockControl>