Feature: Always apply most current layout (#11851)

Author: lukeblevins

src/Files.App/BaseLayout.cs

@@ -382,6 +382,7 @@ protected virtual void BaseFolderSettings_LayoutModeChangeRequested(object? send
 
 					// Remove old layout from back stack
 					ParentShellPageInstance.RemoveLastPageFromBackStack();
+					ParentShellPageInstance.ResetNavigationStackLayoutMode();
 				}
 
 				ParentShellPageInstance.FilesystemViewModel.UpdateEmptyTextType();

src/Files.App/IShellPage.cs

@@ -53,6 +53,11 @@ public interface IShellPage : ITabItemContent, IMultiPaneInfo, IDisposable
 
 		void RemoveLastPageFromBackStack();
 
+		/// <summary>
+		/// Replaces any outdated entries with those of the correct page type
+		/// </summary>
+		void ResetNavigationStackLayoutMode();
+
 		void SubmitSearch(string query, bool searchUnindexedItems);
 
 		/// <summary>

src/Files.App/Views/BaseShellPage.cs

@@ -499,6 +499,39 @@ public virtual void Forward_Click()
 			ItemDisplay.GoForward();
 		}
 
+		public void ResetNavigationStackLayoutMode()
+		{
+			foreach (PageStackEntry entry in ItemDisplay.BackStack.ToList())
+			{
+				if (entry.Parameter is NavigationArguments args)
+				{
+					var correctPageType = FolderSettings.GetLayoutType(args.NavPathParam);
+					if (!entry.SourcePageType.Equals(correctPageType))
+					{
+						int index = ItemDisplay.BackStack.IndexOf(entry);
+						var newEntry = new PageStackEntry(correctPageType, entry.Parameter, entry.NavigationTransitionInfo);
+						ItemDisplay.BackStack.RemoveAt(index);
+						ItemDisplay.BackStack.Insert(index, newEntry);
+					}
+				}
+			}
+
+			foreach (PageStackEntry entry in ItemDisplay.ForwardStack.ToList())
+			{
+				if (entry.Parameter is NavigationArguments args)
+				{
+					var correctPageType = FolderSettings.GetLayoutType(args.NavPathParam);
+					if (!entry.SourcePageType.Equals(correctPageType))
+					{
+						int index = ItemDisplay.ForwardStack.IndexOf(entry);
+						var newEntry = new PageStackEntry(correctPageType, entry.Parameter, entry.NavigationTransitionInfo);
+						ItemDisplay.ForwardStack.RemoveAt(index);
+						ItemDisplay.ForwardStack.Insert(index, newEntry);
+					}
+				}
+			}
+		}
+
 		public void RemoveLastPageFromBackStack()
 		{
 			ItemDisplay.BackStack.Remove(ItemDisplay.BackStack.Last());