Fix: Fixed issue where options in the conflicts dialog could change w…

…hen scrolling (#14256)

src/Files.App/Dialogs/FilesystemOperationDialog.xaml

@@ -104,15 +104,15 @@
 				</Grid>
 
 				<!--  Options  -->
+				<!--  x:Load cannot be used (#14000)  -->
 				<ComboBox
 					x:Name="ConflictOptions"
 					Grid.Column="2"
 					Width="200"
 					HorizontalAlignment="Right"
 					VerticalAlignment="Center"
-					x:Load="{x:Bind IsConflict, Mode=OneWay}"
-					Loaded="ConflictOptions_Loaded"
-					SelectedIndex="{x:Bind ConflictResolveOption, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, Converter={StaticResource ConflictResolveOptionToIndexConverter}}">
+					SelectedIndex="{x:Bind ConflictResolveOption, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, Converter={StaticResource ConflictResolveOptionToIndexConverter}}"
+					Visibility="{x:Bind IsConflict, Mode=OneWay}">
 					<ComboBox.Items>
 						<ComboBoxItem Content="{helpers:ResourceString Name=GenerateNewName}" />
 						<ComboBoxItem Content="{helpers:ResourceString Name=ReplaceExisting}" />

src/Files.App/Dialogs/FilesystemOperationDialog.xaml.cs

@@ -106,19 +106,6 @@ private void NameEdit_Loaded(object sender, RoutedEventArgs e)
 			(sender as TextBox)?.Focus(FocusState.Programmatic);
 		}
 
-		private void ConflictOptions_Loaded(object sender, RoutedEventArgs e)
-		{
-			if (sender is ComboBox comboBox)
-				comboBox.SelectedIndex = ViewModel.LoadConflictResolveOption() switch
-				{
-					FileNameConflictResolveOptionType.None => -1,
-					FileNameConflictResolveOptionType.GenerateNewName => 0,
-					FileNameConflictResolveOptionType.ReplaceExisting => 1,
-					FileNameConflictResolveOptionType.Skip => 2,
-					_ => -1
-				};
-		}
-
 		private void FilesystemOperationDialog_Opened(ContentDialog sender, ContentDialogOpenedEventArgs args)
 		{
 			UpdateDialogLayout();

src/Files.Core/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogViewModel.cs

@@ -59,11 +59,18 @@ private FileSystemDialogViewModel(FileSystemDialogMode fileSystemDialogMode, IEn
 
 			_dialogClosingCts = new();
 
+			_AggregatedResolveOption = _userSettingsService.GeneralSettingsService.ConflictsResolveOption;
+
 			_messenger = new WeakReferenceMessenger();
 			_messenger.Register(this);
 
 			foreach (var item in items)
+			{
+				if (item is FileSystemDialogConflictItemViewModel conflictItem && conflictItem.IsConflict)
+					conflictItem.ConflictResolveOption = _AggregatedResolveOption;
+
 				item.Messenger = _messenger;
+			}
 
 			Items = new(items);
 
@@ -111,11 +118,6 @@ public void Receive(FileSystemDialogOptionChangedMessage message)
 			}
 		}
 
-		public FileNameConflictResolveOptionType LoadConflictResolveOption()
-		{
-			return _userSettingsService.GeneralSettingsService.ConflictsResolveOption;
-		}
-
 		public void SaveConflictResolveOption()
 		{
 			if (AggregatedResolveOption != FileNameConflictResolveOptionType.None &&