Skip to content

Fix: Fixed keyboard navigation in the address path bar #16653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 31, 2024
Merged

Fix: Fixed keyboard navigation in the address path bar #16653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93e0bb1
Fix: Fixed keyboard navigation in the address path bar
yaira2 Dec 23, 2024
a13085c
Update AddressToolbar.xaml.cs
yaira2 Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Files.App/UserControls/AddressToolbar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@
BorderBrush="{ThemeResource ControlElevationBorderBrush}"
BorderThickness="1"
CornerRadius="{StaticResource ControlCornerRadius}"
GettingFocus="ClickablePath_GettingFocus"
PointerPressed="ManualPathEntryItem_Click"
Visibility="{x:Bind converters:MultiBooleanConverter.OrNotConvertToVisibility(ShowSearchBox, ViewModel.IsSearchBoxVisible), Mode=OneWay}">
<Grid.ColumnDefinitions>
Expand Down
20 changes: 19 additions & 1 deletion src/Files.App/UserControls/AddressToolbar.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,18 @@ private void ManualPathEntryItem_Click(object _, PointerRoutedEventArgs e)
ViewModel.IsEditModeEnabled = true;
}

private void VisiblePath_KeyDown(object _, KeyRoutedEventArgs e)
private async void VisiblePath_KeyDown(object _, KeyRoutedEventArgs e)
{
if (e.Key is VirtualKey.Escape)
ViewModel.IsEditModeEnabled = false;

if (e.Key is VirtualKey.Tab)
{
ViewModel.IsEditModeEnabled = false;
// Delay to ensure clickable path is ready to be focused
await Task.Delay(10);
ClickablePath.Focus(FocusState.Keyboard);
}
}
private void VisiblePath_LostFocus(object _, RoutedEventArgs e)
{
Expand Down Expand Up @@ -216,5 +224,15 @@ private void HistoryItemClicked(ToolbarHistoryItemModel? itemModel)
shellPage.Forward_Click();
}
}

private void ClickablePath_GettingFocus(UIElement sender, GettingFocusEventArgs args)
{
if (args.InputDevice != FocusInputDeviceKind.Keyboard)
return;

var previousControl = args.OldFocusedElement as FrameworkElement;
if (previousControl?.Name == nameof(HomeButton) || previousControl?.Name == nameof(Refresh))
ViewModel.IsEditModeEnabled = true;
}
}
}
Loading