Fix: Fixed issue where certain changes in the Properties Window could…

…n't be canceled (#14661)
files-community · Feb 7, 2024 · 7839bb0 · 7839bb0
1 parent 6c9afe2
commit 7839bb0
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 20 deletions.
diff --git a/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs b/src/Files.App/Data/Models/SelectedItemsPropertiesViewModel.cs
@@ -558,7 +558,18 @@ public string ShortcutItemType
 		public string ShortcutItemPath
 		{
 			get => shortcutItemPath;
-			set => SetProperty(ref shortcutItemPath, value);
+			set
+			{
+				SetProperty(ref shortcutItemPath, value);
+				ShortcutItemPathEditedValue = value;
+			}
+		}
+
+		private string shortcutItemPathEditedValue;
+		public string ShortcutItemPathEditedValue
+		{
+			get => shortcutItemPathEditedValue;
+			set => SetProperty(ref shortcutItemPathEditedValue, value);
 		}
 
 		private bool isShortcutItemPathReadOnly;
@@ -572,7 +583,18 @@ public bool IsShortcutItemPathReadOnly
 		public string ShortcutItemWorkingDir
 		{
 			get => shortcutItemWorkingDir;
-			set => SetProperty(ref shortcutItemWorkingDir, value);
+			set
+			{
+				SetProperty(ref shortcutItemWorkingDir, value);
+				ShortcutItemWorkingDirEditedValue = value;
+			}
+		}
+
+		private string shortcutItemWorkingDirEditedValue;
+		public string ShortcutItemWorkingDirEditedValue
+		{
+			get => shortcutItemWorkingDirEditedValue;
+			set => SetProperty(ref shortcutItemWorkingDirEditedValue, value);
 		}
 
 		private bool shortcutItemWorkingDirVisibility = false;
@@ -589,6 +611,17 @@ public string ShortcutItemArguments
 			set
 			{
 				SetProperty(ref shortcutItemArguments, value);
+				ShortcutItemArgumentsEditedValue = value;
+			}
+		}
+
+		private string shortcutItemArgumentsEditedValue;
+		public string ShortcutItemArgumentsEditedValue
+		{
+			get => shortcutItemArgumentsEditedValue;
+			set
+			{
+				SetProperty(ref shortcutItemArgumentsEditedValue, value);
 			}
 		}
 
@@ -648,6 +681,18 @@ public bool IsReadOnly
 			{
 				IsReadOnlyEnabled = true;
 				SetProperty(ref isReadOnly, value);
+				IsReadOnlyEditedValue = value;
+			}
+		}
+
+		private bool isReadOnlyEditedValue;
+		public bool IsReadOnlyEditedValue
+		{
+			get => isReadOnlyEditedValue;
+			set
+			{
+				IsReadOnlyEnabled = true;
+				SetProperty(ref isReadOnlyEditedValue, value);
 			}
 		}
 
@@ -662,7 +707,18 @@ public bool IsReadOnlyEnabled
 		public bool IsHidden
 		{
 			get => isHidden;
-			set => SetProperty(ref isHidden, value);
+			set
+			{
+				SetProperty(ref isHidden, value);
+				IsHiddenEditedValue = value;
+			}
+		}
+
+		private bool isHiddenEditedValue;
+		public bool IsHiddenEditedValue
+		{
+			get => isHiddenEditedValue;
+			set => SetProperty(ref isHiddenEditedValue, value);
 		}
 
 		private bool runAsAdmin;
@@ -673,6 +729,18 @@ public bool RunAsAdmin
 			{
 				RunAsAdminEnabled = true;
 				SetProperty(ref runAsAdmin, value);
+				RunAsAdminEditedValue = value;
+			}
+		}
+
+		private bool runAsAdminEditedValue;
+		public bool RunAsAdminEditedValue
+		{
+			get => runAsAdminEditedValue;
+			set
+			{
+				RunAsAdminEnabled = true;
+				SetProperty(ref runAsAdminEditedValue, value);
 			}
 		}
 

diff --git a/src/Files.App/ViewModels/Properties/Items/FileProperties.cs b/src/Files.App/ViewModels/Properties/Items/FileProperties.cs
@@ -266,7 +266,7 @@ private async void ViewModel_PropertyChanged(object sender, System.ComponentMode
 		{
 			switch (e.PropertyName)
 			{
-				case "IsReadOnly":
+				case nameof(ViewModel.IsReadOnly):
 					if (ViewModel.IsReadOnly)
 					{
 						NativeFileOperationsHelper.SetFileAttribute(
@@ -284,7 +284,7 @@ private async void ViewModel_PropertyChanged(object sender, System.ComponentMode
 
 					break;
 
-				case "IsHidden":
+				case nameof(ViewModel.IsHidden):
 					if (ViewModel.IsHidden)
 					{
 						NativeFileOperationsHelper.SetFileAttribute(
@@ -302,10 +302,10 @@ private async void ViewModel_PropertyChanged(object sender, System.ComponentMode
 
 					break;
 
-				case "RunAsAdmin":
-				case "ShortcutItemPath":
-				case "ShortcutItemWorkingDir":
-				case "ShortcutItemArguments":
+				case nameof(ViewModel.RunAsAdmin):
+				case nameof(ViewModel.ShortcutItemPath):
+				case nameof(ViewModel.ShortcutItemWorkingDir):
+				case nameof(ViewModel.ShortcutItemArguments):
 					if (string.IsNullOrWhiteSpace(ViewModel.ShortcutItemPath))
 						return;
 

diff --git a/src/Files.App/Views/Properties/GeneralPage.xaml b/src/Files.App/Views/Properties/GeneralPage.xaml
@@ -704,7 +704,7 @@
 							HorizontalAlignment="Right"
 							VerticalAlignment="Center"
 							AutomationProperties.Name="{helpers:ResourceString Name=ReadOnly}"
-							IsChecked="{x:Bind ViewModel.IsReadOnly, Mode=TwoWay}"
+							IsChecked="{x:Bind ViewModel.IsReadOnlyEditedValue, Mode=TwoWay}"
 							IsEnabled="{x:Bind ViewModel.IsReadOnlyEnabled, Mode=OneWay}" />
 
 						<!--  (Divider)  -->
@@ -731,7 +731,7 @@
 							HorizontalAlignment="Right"
 							VerticalAlignment="Center"
 							AutomationProperties.Name="{helpers:ResourceString Name=Hidden}"
-							IsChecked="{x:Bind ViewModel.IsHidden, Mode=TwoWay}" />
+							IsChecked="{x:Bind ViewModel.IsHiddenEditedValue, Mode=TwoWay}" />
 
 					</Grid>
 				</Expander.Content>

diff --git a/src/Files.App/Views/Properties/GeneralPage.xaml.cs b/src/Files.App/Views/Properties/GeneralPage.xaml.cs
@@ -173,6 +173,9 @@ async Task<bool> SaveBaseAsync(ListedItem item)
 					});
 				}
 
+				ViewModel.IsReadOnly = ViewModel.IsReadOnlyEditedValue;
+				ViewModel.IsHidden = ViewModel.IsHiddenEditedValue;
+
 				if (!GetNewName(out var newName))
 					return true;
 

diff --git a/src/Files.App/Views/Properties/ShortcutPage.xaml b/src/Files.App/Views/Properties/ShortcutPage.xaml
@@ -75,7 +75,7 @@
 					Grid.Column="1"
 					VerticalAlignment="Center"
 					IsReadOnly="{x:Bind ViewModel.IsShortcutItemPathReadOnly, Mode=OneWay}"
-					Text="{x:Bind ViewModel.ShortcutItemPath, Mode=TwoWay}"
+					Text="{x:Bind ViewModel.ShortcutItemPathEditedValue, Mode=TwoWay}"
 					Visibility="Visible" />
 			</Grid>
 
@@ -117,7 +117,7 @@
 					Grid.Column="1"
 					VerticalAlignment="Center"
 					x:Load="{x:Bind ViewModel.ShortcutItemArgumentsVisibility, Mode=OneWay}"
-					Text="{x:Bind ViewModel.ShortcutItemArguments, Mode=TwoWay}" />
+					Text="{x:Bind ViewModel.ShortcutItemArgumentsEditedValue, Mode=TwoWay}" />
 
 				<TextBlock
 					x:Name="PropertiesShortcutItemWorkingDir"
@@ -134,7 +134,7 @@
 					Grid.Column="1"
 					VerticalAlignment="Center"
 					x:Load="{x:Bind ViewModel.ShortcutItemWorkingDirVisibility, Mode=OneWay}"
-					Text="{x:Bind ViewModel.ShortcutItemWorkingDir, Mode=TwoWay}" />
+					Text="{x:Bind ViewModel.ShortcutItemWorkingDirEditedValue, Mode=TwoWay}" />
 			</Grid>
 
 			<settingsuc:SettingsBlockControl
@@ -144,7 +144,7 @@
 				x:Load="{x:Bind ViewModel.RunAsAdminEnabled, Mode=OneWay}">
 				<ToggleSwitch
 					AutomationProperties.Name="{helpers:ResourceString Name=RunAsAdministrator}"
-					IsOn="{x:Bind ViewModel.RunAsAdmin, Mode=TwoWay}"
+					IsOn="{x:Bind ViewModel.RunAsAdminEditedValue, Mode=TwoWay}"
 					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
 			</settingsuc:SettingsBlockControl>
 

diff --git a/src/Files.App/Views/Properties/ShortcutPage.xaml.cs b/src/Files.App/Views/Properties/ShortcutPage.xaml.cs
@@ -1,12 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using CommunityToolkit.WinUI;
-using Files.App.Extensions;
-using Files.App.Utils;
-using Files.App.Helpers;
 using Files.App.ViewModels.Properties;
-using System.Threading.Tasks;
 
 namespace Files.App.Views.Properties
 {
@@ -29,6 +24,11 @@ public override async Task<bool> SaveChangesAsync()
 			if (shortcutItem is null)
 				return true;
 
+			ViewModel.RunAsAdmin = ViewModel.RunAsAdminEditedValue;
+			ViewModel.ShortcutItemPath = ViewModel.ShortcutItemPathEditedValue;
+			ViewModel.ShortcutItemWorkingDir = ViewModel.ShortcutItemWorkingDirEditedValue;
+			ViewModel.ShortcutItemArguments = ViewModel.ShortcutItemArgumentsEditedValue;
+
 			await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 				UIFilesystemHelpers.UpdateShortcutItemProperties(shortcutItem,
 				ViewModel.ShortcutItemPath,