Fix: Fixed an issue where sorting preferences didn't save when changed in the columns layout (#16302)

Author: hishitetsu

src/Files.App/Views/Shells/BaseShellPage.cs

@@ -699,8 +699,14 @@ protected void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoad
 			}
 		}
 
-		protected virtual void FolderSettings_LayoutPreferencesUpdateRequired(object sender, LayoutPreferenceEventArgs e)
+		private void FolderSettings_LayoutPreferencesUpdateRequired(object sender, LayoutPreferenceEventArgs e)
 		{
+			if (ShellViewModel is null)
+				return;
+
+			LayoutPreferencesManager.SetLayoutPreferencesForPath(ShellViewModel.WorkingDirectory, e.LayoutPreference);
+			if (e.IsAdaptiveLayoutUpdateRequired)
+				AdaptiveLayoutHelpers.ApplyAdaptativeLayout(InstanceViewModel.FolderSettings, ShellViewModel.FilesAndFolders.ToList());
 		}
 
 		protected virtual void ViewModel_WorkingDirectoryModified(object sender, WorkingDirectoryModifiedEventArgs e)

src/Files.App/Views/Shells/ColumnShellPage.xaml.cs

@@ -61,6 +61,10 @@ protected override void ShellPage_NavigationRequested(object sender, PathNavigat
 
 		protected override void OnNavigationParamsChanged()
 		{
+			if (ColumnParams.NavPathParam is not null)
+				// This method call is required to load the sorting preferences.
+				InstanceViewModel.FolderSettings.GetLayoutType(ColumnParams.NavPathParam);
+
 			ItemDisplayFrame.Navigate(
 				typeof(ColumnLayoutPage),
 				new NavigationArguments()
@@ -183,25 +187,5 @@ public override void NavigateHome()
 
 		public override Task WhenIsCurrent()
 			=> Task.WhenAll(_IsCurrentInstanceTCS.Task, this.FindAscendant<ColumnsLayoutPage>()?.ParentShellPageInstance?.WhenIsCurrent() ?? Task.CompletedTask);
-
-		public void RemoveLastPageFromBackStack()
-		{
-			ItemDisplayFrame.BackStack.Remove(ItemDisplayFrame.BackStack.Last());
-		}
-
-		public void SubmitSearch(string query)
-		{
-			ShellViewModel.CancelSearch();
-			InstanceViewModel.CurrentSearchQuery = query;
-			ItemDisplayFrame.Navigate(typeof(ColumnLayoutPage), new NavigationArguments()
-			{
-				AssociatedTabInstance = this,
-				IsSearchResultPage = true,
-				SearchPathParam = ShellViewModel.WorkingDirectory,
-				SearchQuery = query,
-			});
-
-			//this.FindAscendant<ColumnViewBrowser>().SetSelectedPathOrNavigate(null, typeof(ColumnViewBase), navArgs);
-		}
 	}
 }

src/Files.App/Views/Shells/ModernShellPage.xaml.cs

@@ -58,16 +58,6 @@ private void ModernShellPage_RefreshWidgetsRequested(object sender, EventArgs e)
 				currentPage.ViewModel.RefreshWidgetList();
 		}
 
-		protected override void FolderSettings_LayoutPreferencesUpdateRequired(object sender, LayoutPreferenceEventArgs e)
-		{
-			if (ShellViewModel is null)
-				return;
-
-			LayoutPreferencesManager.SetLayoutPreferencesForPath(ShellViewModel.WorkingDirectory, e.LayoutPreference);
-			if (e.IsAdaptiveLayoutUpdateRequired)
-				AdaptiveLayoutHelpers.ApplyAdaptativeLayout(InstanceViewModel.FolderSettings, ShellViewModel.FilesAndFolders.ToList());
-		}
-
 		protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 		{
 			base.OnNavigatedTo(eventArgs);