Skip to content

Commit 7678c24

Browse files
committed
More focus improvements
1 parent 9578162 commit 7678c24

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/Files.App/UserControls/NavigationToolbar.xaml.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ private async void Omnibar_QuerySubmitted(Omnibar sender, OmnibarQuerySubmittedE
260260
if (Omnibar.CurrentSelectedMode == OmnibarPathMode)
261261
{
262262
await ViewModel.HandleItemNavigationAsync(args.Text);
263+
(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
263264
}
264265
else if (Omnibar.CurrentSelectedMode == OmnibarCommandPaletteMode)
265266
{
@@ -294,8 +295,7 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.CommandNotExecutable.GetLocali
294295
}
295296
}
296297

297-
ViewModel.OmnibarCurrentSelectedMode = OmnibarPathMode;
298-
ViewModel.OmnibarCommandPaletteModeText = string.Empty;
298+
(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
299299
}
300300
else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
301301
{
@@ -418,6 +418,8 @@ private void Omnibar_LostFocus(object sender, RoutedEventArgs e)
418418
ViewModel.OmnibarCurrentSelectedMode = OmnibarPathMode;
419419
ViewModel.OmnibarCommandPaletteModeText = string.Empty;
420420
}
421+
422+
(MainPageViewModel.SelectedTabItem?.TabItemContent as Control)?.Focus(FocusState.Programmatic);
421423
}
422424

423425
private void Omnibar_PreviewKeyDown(object sender, KeyRoutedEventArgs e)

0 commit comments

Comments
 (0)