Fixed an issue where navigation shortcuts wouldn't work when items were selected (#2147)

Author: gave92

Files/UserControls/ModernNavigationToolbar.xaml

@@ -678,6 +678,7 @@
                 <Button.KeyboardAccelerators>
                     <KeyboardAccelerator Key="XButton1" />
                     <KeyboardAccelerator Key="Back" />
+                    <KeyboardAccelerator Key="Left" Modifiers="Menu" />
                 </Button.KeyboardAccelerators>
             </Button>
 
@@ -703,6 +704,7 @@
                 </Button.Content>
                 <Button.KeyboardAccelerators>
                     <KeyboardAccelerator Key="XButton2" />
+                    <KeyboardAccelerator Key="Right" Modifiers="Menu" />
                 </Button.KeyboardAccelerators>
             </Button>
 

Files/Views/LayoutModes/GenericFileBrowser.xaml.cs

@@ -434,6 +434,11 @@ private void AllView_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
             {
                 AssociatedInteractions.ShowPropertiesButton_Click(null, null);
             }
+            else if (e.KeyStatus.IsMenuKeyDown && (e.Key == VirtualKey.Left || e.Key == VirtualKey.Right || e.Key == VirtualKey.Up))
+            {
+                // Unfocus the GridView so keyboard shortcut can be handled
+                this.Focus(FocusState.Programmatic);
+            }
         }
 
         public void AllView_RightTapped(object sender, RightTappedRoutedEventArgs e)

Files/Views/LayoutModes/GridViewBrowser.xaml.cs

@@ -307,6 +307,11 @@ private void FileList_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
                     e.Handled = true;
                 }
             }
+            else if (e.KeyStatus.IsMenuKeyDown && (e.Key == VirtualKey.Left || e.Key == VirtualKey.Right || e.Key == VirtualKey.Up))
+            {
+                // Unfocus the GridView so keyboard shortcut can be handled
+                this.Focus(FocusState.Programmatic);
+            }
         }
 
         protected override void Page_CharacterReceived(CoreWindow sender, CharacterReceivedEventArgs args)

Files/Views/ModernShellPage.xaml

@@ -121,14 +121,6 @@
             Key="Space"
             Invoked="KeyboardAccelerator_Invoked"
             Modifiers="None" />
-        <KeyboardAccelerator
-            Key="Left"
-            Invoked="KeyboardAccelerator_Invoked"
-            Modifiers="Menu" />
-        <KeyboardAccelerator
-            Key="Right"
-            Invoked="KeyboardAccelerator_Invoked"
-            Modifiers="Menu" />
         <KeyboardAccelerator
             Key="R"
             Invoked="KeyboardAccelerator_Invoked"

Files/Views/ModernShellPage.xaml.cs

@@ -290,14 +290,6 @@ private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, Keybo
                     }
                     break;
 
-                case (false, false, true, true, VirtualKey.Left): // alt + back arrow, backward
-                    NavigationActions.Back_Click(null, null);
-                    break;
-
-                case (false, false, true, true, VirtualKey.Right): // alt + right arrow, forward
-                    NavigationActions.Forward_Click(null, null);
-                    break;
-
                 case (true, false, false, true, VirtualKey.R): // ctrl + r, refresh
                     NavigationActions.Refresh_Click(null, null);
                     break;