Comments

Author: yaira2

src/Files.App/ViewModels/ShellViewModel.cs

@@ -584,9 +584,9 @@ 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
-			// from happening, the pane is locked and focus is restored when file loading
-			// completes, this occurs in the `RefreshItem()` method in BaseLayoutPage.cs.
+			// 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();

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

@@ -1240,9 +1240,9 @@ private void RefreshItem(SelectorItem container, object item, bool inRecycleQueu
 						if (ParentShellPageInstance.ShellViewModel.EnabledGitProperties is not GitProperties.None && listedItem is IGitItem gitItem)
 							await ParentShellPageInstance.ShellViewModel.LoadGitPropertiesAsync(gitItem);
 
-						// Layout changes can cause the active pane to lose focus, to prevent this
-						// from happening, the pane is locked and focus is restored when file loading
-						// completes, the locking occurs in the `LayoutModeChangeRequested()` method in ShellViewModel.cs.
+						// Layout changes can cause the active pane to lose focus. To prevent this,
+						// the pane is locked in LayoutModeChangeRequested() and focus is restored here
+						// when file loading completes.
 						// See https://github.com/files-community/Files/issues/15397
 						// See https://github.com/files-community/Files/issues/16530
 

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

@@ -673,14 +673,11 @@ private void Pane_Loaded(object sender, RoutedEventArgs e)
 
 		private void Pane_GettingFocus(UIElement sender, GettingFocusEventArgs args)
 		{
-			// Layout changes can cause the active pane to lose focus, to prevent this
-			// from happening, the pane is locked and focus is restored when file loading
-			// completes.
-			// The locking occurs in the `LayoutModeChangeRequested()` method in ShellViewModel.cs.
-			// The focus is restored in the `RefreshItem()` method in BaseLayoutPage.cs
+			// Cancel focus attempts while the active pane is locked during layout changes.
+			// Pane locking occurs in LayoutModeChangeRequested() in ShellViewModel.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
-
 			if (IsActivePaneLocked)
 			{
 				IsActivePaneLocked = false;