Code Quality: Only lock pane when layout mode changes

Author: yaira2

src/Files.App/ViewModels/ShellViewModel.cs

@@ -584,13 +584,6 @@ public ShellViewModel(LayoutPreferencesManager folderSettingsViewModel)
 
 		private async void LayoutModeChangeRequested(object? sender, LayoutModeEventArgs e)
 		{
-			// Layout changes can cause the active pane to lose focus. To prevent this,
-			// the pane is locked here and focus is restored when file loading completes
-			// in the RefreshItem() method in BaseLayoutPage.cs.
-			// See https://github.com/files-community/Files/issues/15397
-			// See https://github.com/files-community/Files/issues/16530
-			ContentPageContext.ShellPage!.PaneHolder.LockActivePane();
-
 			await dispatcherQueue.EnqueueOrInvokeAsync(CheckForBackgroundImage, Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
 		}
 

src/Files.App/Views/Layouts/BaseLayoutPage.cs

@@ -372,6 +372,13 @@ protected virtual void BaseFolderSettings_LayoutModeChangeRequested(object? send
 
 				if (layoutType != ParentShellPageInstance.CurrentPageType)
 				{
+					// Layout changes can cause the active pane to lose focus. To prevent this,
+					// the pane is locked here and focus is restored when file loading completes
+					// in the RefreshItem() method in BaseLayoutPage.cs.
+					// See https://github.com/files-community/Files/issues/15397
+					// See https://github.com/files-community/Files/issues/16530
+					ParentShellPageInstance!.PaneHolder.LockActivePane();
+
 					ParentShellPageInstance.NavigateWithArguments(layoutType, new NavigationArguments()
 					{
 						NavPathParam = navigationArguments!.NavPathParam,

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

@@ -679,7 +679,7 @@ private void Pane_Loaded(object sender, RoutedEventArgs e)
 		private void Pane_GettingFocus(UIElement sender, GettingFocusEventArgs args)
 		{
 			// Cancel focus attempts while the active pane is locked during layout changes.
-			// Pane locking occurs in LayoutModeChangeRequested() in ShellViewModel.cs.
+			// Pane locking occurs in BaseFolderSettings_LayoutModeChangeRequested() in BaseLayoutPage.cs.
 			// Focus is restored in RefreshItem() in BaseLayoutPage.cs when file loading completes.
 			// See https://github.com/files-community/Files/issues/15397
 			// See https://github.com/files-community/Files/issues/16530