Skip to content

Commit 2d43a25

Browse files
committed
Fix issue with focus not jumping to folder
1 parent 69609cc commit 2d43a25

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ public ColumnViewBase() : base()
4444
selectionRectangle.SelectionEnded += SelectionRectangle_SelectionEnded;
4545
tapDebounceTimer = DispatcherQueue.CreateTimer();
4646
this.ItemInvoked += ColumnViewBase_ItemInvoked;
47+
this.GotFocus += ColumnViewBase_GotFocus;
48+
}
49+
50+
private void ColumnViewBase_GotFocus(object sender, RoutedEventArgs e)
51+
{
52+
openedFolderPresenter?.Focus(FocusState.Programmatic);
4753
}
4854

4955
private void ColumnViewBase_ItemInvoked(object? sender, EventArgs e)
@@ -60,6 +66,7 @@ private void ClearOpenedFolderSelectionIndicator()
6066
openedFolderPresenter.Background = new SolidColorBrush(Microsoft.UI.Colors.Transparent);
6167
var presenter = openedFolderPresenter.FindDescendant<Grid>()!;
6268
presenter!.Background = new SolidColorBrush(Microsoft.UI.Colors.Transparent);
69+
openedFolderPresenter = null;
6370
}
6471

6572
protected override void HookEvents()

0 commit comments

Comments
 (0)