diff --git a/src/Files.App/UserControls/PathBreadcrumb.xaml b/src/Files.App/UserControls/PathBreadcrumb.xaml index a145c34c41d4..db02dd71a56d 100644 --- a/src/Files.App/UserControls/PathBreadcrumb.xaml +++ b/src/Files.App/UserControls/PathBreadcrumb.xaml @@ -136,7 +136,7 @@ IsItemClickEnabled="True" ItemTemplateSelector="{StaticResource PathBreadcrumbItemSelector}" ItemsSource="{x:Bind ViewModel.PathComponents, Mode=OneWay}" - KeyDown="PathBoxItem_KeyDown" + PreviewKeyDown="PathBoxItem_PreviewKeyDown" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.HorizontalScrollMode="Enabled" ScrollViewer.VerticalScrollBarVisibility="Disabled" diff --git a/src/Files.App/UserControls/PathBreadcrumb.xaml.cs b/src/Files.App/UserControls/PathBreadcrumb.xaml.cs index 0ff28ca67331..e00a0b52262c 100644 --- a/src/Files.App/UserControls/PathBreadcrumb.xaml.cs +++ b/src/Files.App/UserControls/PathBreadcrumb.xaml.cs @@ -55,9 +55,9 @@ private void PathBoxItem_PointerPressed(object sender, PointerRoutedEventArgs e) ViewModel.PathBoxItem_PointerPressed(sender, e); } - private void PathBoxItem_KeyDown(object sender, KeyRoutedEventArgs e) + private void PathBoxItem_PreviewKeyDown(object sender, KeyRoutedEventArgs e) { - ViewModel.PathBoxItem_KeyDown(sender, e); + ViewModel.PathBoxItem_PreviewKeyDown(sender, e); } } } diff --git a/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs index 099d4c7fa141..4a770a16bc85 100644 --- a/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs @@ -525,14 +525,32 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () => }); } - public void PathBoxItem_KeyDown(object sender, KeyRoutedEventArgs e) + public void PathBoxItem_PreviewKeyDown(object sender, KeyRoutedEventArgs e) { - if (e.Key == Windows.System.VirtualKey.Down) + switch (e.Key) { - var item = e.OriginalSource as ListViewItem; - var button = item?.FindDescendant