Fix: Keep sort and group options consistent between tabs

Author: ferrariofilippo

src/Files.App/Data/Contracts/IShellPanesPage.cs

@@ -58,5 +58,10 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged
 		/// Focuses the other pane.
 		/// </summary>
 		public void FocusOtherPane();
+
+		/// <summary>
+		/// Updates the layout of open panes.
+		/// </summary>
+		public void UpdatePanesLayout();
 	}
 }

src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs

@@ -265,6 +265,22 @@ public Type GetLayoutType(string path, bool changeLayoutMode = true)
 			};
 		}
 
+		public void UpdateGroupAndSortOptions(string? path)
+		{
+			if (string.IsNullOrWhiteSpace(path))
+				return;
+
+			var preferencesItem = GetLayoutPreferencesForPath(path);
+			if (preferencesItem is null)
+				return;
+
+			DirectorySortOption = preferencesItem.DirectorySortOption;
+			DirectorySortDirection = preferencesItem.DirectorySortDirection;
+			DirectoryGroupOption = preferencesItem.DirectoryGroupOption;
+			DirectoryGroupByDateUnit = preferencesItem.DirectoryGroupByDateUnit;
+			DirectoryGroupDirection = preferencesItem.DirectoryGroupDirection;
+		}
+
 		public bool IsPathUsingDefaultLayout(string? path)
 		{
 			return UserSettingsService.LayoutSettingsService.SyncFolderPreferencesAcrossDirectories ||

src/Files.App/Views/MainPage.xaml.cs

@@ -171,6 +171,8 @@ public async void MultitaskingControl_CurrentInstanceChanged(object? sender, Cur
 			{
 				SidebarAdaptiveViewModel.PaneHolder = currentInstance;
 				SidebarAdaptiveViewModel.PaneHolder.PropertyChanged += PaneHolder_PropertyChanged;
+				// Issue doesn't update the secondary pane in general
+				currentInstance.UpdatePanesLayout();
 			}
 			SidebarAdaptiveViewModel.NotifyInstanceRelatedPropertiesChanged((navArgs as PaneNavigationArguments)?.LeftPaneNavPathParam);
 

src/Files.App/Views/ShellPanesPage.xaml.cs

@@ -185,7 +185,10 @@ public IShellPage? ActivePane
 						secondShellPage.IsCurrentInstance = false;
 
 					if (ActivePane is not null)
+					{
 						ActivePane.IsCurrentInstance = IsCurrentInstance;
+						UpdatePaneLayout(ActivePane);
+					}
 
 					NotifyPropertyChanged(nameof(ActivePane));
 					NotifyPropertyChanged(nameof(IsLeftPaneActive));
@@ -356,6 +359,17 @@ public void FocusOtherPane()
 				GetPane(0)?.Focus(FocusState.Programmatic);
 		}
 
+		/// <inheritdoc/>
+		public void UpdatePanesLayout()
+		{
+			if (GetPane(0) is IShellPage leftPane)
+				UpdatePaneLayout(leftPane);
+
+
+			if (GetPane(1) is IShellPage rightPane)
+				UpdatePaneLayout(rightPane);
+		}
+
 		// Private methods
 
 		private ModernShellPage? GetPane(int index = -1)
@@ -603,6 +617,13 @@ paneArgs.ShellPaneArrangement is ShellPaneArrangement.None
 			};
 		}
 
+		private void UpdatePaneLayout(IShellPage pane)
+		{
+			var page = pane.SlimContentPage as BaseLayoutPage;
+			var path = pane.ShellViewModel.CurrentFolder?.ItemPath;
+			page?.FolderSettings?.UpdateGroupAndSortOptions(path);
+		}
+
 		// Event methods
 
 		public Task TabItemDragOver(object sender, DragEventArgs e)