Fix focus cycle in column view when some settings change (#7484)

gave92 · web-flow · commit 1d787210963b · 2022-01-06T19:56:04.000-05:00
diff --git a/src/Files/BaseLayout.cs b/src/Files/BaseLayout.cs
@@ -486,8 +486,6 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)
             UpdateCollectionViewSource();
             FolderSettings.IsLayoutModeChanging = false;
 
-            ItemManipulationModel.FocusFileList(); // Set focus on layout specific file list control
-
             SetSelectedItemsOnNavigation();
 
             ItemContextMenuFlyout.Opening += ItemContextFlyout_Opening;
@@ -509,6 +507,10 @@ public void SetSelectedItemsOnNavigation()
                     ItemManipulationModel.SetSelectedItems(liItemsToSelect);
                     ItemManipulationModel.FocusSelectedItems();
                 }
+                else
+                {
+                    ItemManipulationModel.FocusFileList(); // Set focus on layout specific file list control
+                }
             }
             catch (Exception)
             {
diff --git a/src/Files/Behaviors/StickyHeaderBehavior.cs b/src/Files/Behaviors/StickyHeaderBehavior.cs
@@ -187,6 +187,7 @@ private bool AssignAnimation()
             }
 
             var expressionClipAnimation = ExpressionFunctions.Max(-scrollPropSet.Translation.Y, 0);
+            _contentClip.TopInset = (float)System.Math.Max(-_scrollViewer.VerticalOffset, 0);
             _contentClip.StartAnimation("TopInset", expressionClipAnimation);
 
             return true;
diff --git a/src/Files/Views/ColumnShellPage.xaml.cs b/src/Files/Views/ColumnShellPage.xaml.cs
@@ -818,17 +818,17 @@ private void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoadSt
                     break;
 
                 case ItemLoadStatusChangedEventArgs.ItemLoadStatus.InProgress:
-                    var browser = this.FindAscendant<ColumnViewBrowser>();
-                    NavToolbarViewModel.CanGoBack = browser.ParentShellPageInstance.CanNavigateBackward;
-                    NavToolbarViewModel.CanGoForward = browser.ParentShellPageInstance.CanNavigateForward;
+                    if (this.FindAscendant<ColumnViewBrowser>() is ColumnViewBrowser browser)
+                    {
+                        NavToolbarViewModel.CanGoBack = browser.ParentShellPageInstance.CanNavigateBackward;
+                        NavToolbarViewModel.CanGoForward = browser.ParentShellPageInstance.CanNavigateForward;
+                    }
                     SetLoadingIndicatorForTabs(true);
                     break;
 
                 case ItemLoadStatusChangedEventArgs.ItemLoadStatus.Complete:
                     SetLoadingIndicatorForTabs(false);
                     NavToolbarViewModel.CanRefresh = true;
-                    // Set focus to the file list to allow arrow navigation
-                    ContentPage?.ItemManipulationModel.FocusFileList();
                     // Select previous directory
                     if (!string.IsNullOrWhiteSpace(e.PreviousDirectory))
                     {
diff --git a/src/Files/Views/ModernShellPage.xaml.cs b/src/Files/Views/ModernShellPage.xaml.cs
@@ -976,8 +976,6 @@ private void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoadSt
                 case ItemLoadStatusChangedEventArgs.ItemLoadStatus.Complete:
                     NavToolbarViewModel.CanRefresh = true;
                     SetLoadingIndicatorForTabs(false);
-                    // Set focus to the file list to allow arrow navigation
-                    ContentPage?.ItemManipulationModel.FocusFileList();
                     // Select previous directory
                     if (!InstanceViewModel.IsPageTypeSearchResults && !string.IsNullOrWhiteSpace(e.PreviousDirectory))
                     {

Original file line number	Diff line number	Diff line change
`@@ -486,8 +486,6 @@ protected override async void OnNavigatedTo(NavigationEventArgs eventArgs)`
`486`	`486`	`UpdateCollectionViewSource();`
`487`	`487`	`FolderSettings.IsLayoutModeChanging = false;`
`488`	`488`
`489`		`- ItemManipulationModel.FocusFileList(); // Set focus on layout specific file list control`
`490`		`-`
`491`	`489`	`SetSelectedItemsOnNavigation();`
`492`	`490`
`493`	`491`	`ItemContextMenuFlyout.Opening += ItemContextFlyout_Opening;`
`@@ -509,6 +507,10 @@ public void SetSelectedItemsOnNavigation()`
`509`	`507`	`ItemManipulationModel.SetSelectedItems(liItemsToSelect);`
`510`	`508`	`ItemManipulationModel.FocusSelectedItems();`
`511`	`509`	`}`
	`510`	`+ else`
	`511`	`+ {`
	`512`	`+ ItemManipulationModel.FocusFileList(); // Set focus on layout specific file list control`
	`513`	`+ }`
`512`	`514`	`}`
`513`	`515`	`catch (Exception)`
`514`	`516`	`{`
Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,7 @@ private bool AssignAnimation()`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`var expressionClipAnimation = ExpressionFunctions.Max(-scrollPropSet.Translation.Y, 0);`
	`190`	`+ _contentClip.TopInset = (float)System.Math.Max(-_scrollViewer.VerticalOffset, 0);`
`190`	`191`	`_contentClip.StartAnimation("TopInset", expressionClipAnimation);`
`191`	`192`
`192`	`193`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -976,8 +976,6 @@ private void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoadSt`
`976`	`976`	`case ItemLoadStatusChangedEventArgs.ItemLoadStatus.Complete:`
`977`	`977`	`NavToolbarViewModel.CanRefresh = true;`
`978`	`978`	`SetLoadingIndicatorForTabs(false);`
`979`		`- // Set focus to the file list to allow arrow navigation`
`980`		`- ContentPage?.ItemManipulationModel.FocusFileList();`
`981`	`979`	`// Select previous directory`
`982`	`980`	`if (!InstanceViewModel.IsPageTypeSearchResults && !string.IsNullOrWhiteSpace(e.PreviousDirectory))`
`983`	`981`	`{`