Remove Use of CoreWindow GetKeyState (#1251)

Author: lukeblevins

Files/Views/ModernShellPage.xaml

@@ -11,10 +11,26 @@
     xmlns:local1="using:Files"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
-    KeyUp="ModernShellPage_KeyUp"
     Loaded="Page_Loaded"
     NavigationCacheMode="Required"
     mc:Ignorable="d">
+    <Page.KeyboardAccelerators>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="Control,Shift" Key="N"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="Shift" Key="Delete"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="Control" Key="C"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="Control" Key="V"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="Control" Key="X"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="Control" Key="A"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="Control" Key="N"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="Control" Key="W"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="Control" Key="F4"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="None" Key="Delete"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="None" Key="Space"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="Menu" Key="Left"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="Menu" Key="Right"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="Control" Key="R"/>
+        <KeyboardAccelerator Invoked="KeyboardAccelerator_Invoked" Modifiers="None" Key="F2"/>
+    </Page.KeyboardAccelerators>
 
     <Grid>
         <Grid.ColumnDefinitions>

Files/Views/ModernShellPage.xaml.cs

@@ -205,15 +205,16 @@ public void UpdateProgressFlyout(InteractionOperationType operationType, int amo
             }
         }
 
-        private async void ModernShellPage_KeyUp(object sender, KeyRoutedEventArgs e)
+        private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
         {
-            var ctrl = Window.Current.CoreWindow.GetKeyState(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
-            var alt = Window.Current.CoreWindow.GetKeyState(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
-            var shift = Window.Current.CoreWindow.GetKeyState(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
+            args.Handled = true;
+            var ctrl = args.KeyboardAccelerator.Modifiers.HasFlag(VirtualKeyModifiers.Control);
+            var alt = args.KeyboardAccelerator.Modifiers.HasFlag(VirtualKeyModifiers.Menu);
+            var shift = args.KeyboardAccelerator.Modifiers.HasFlag(VirtualKeyModifiers.Shift);
             var tabInstance = App.CurrentInstance.CurrentPageType == typeof(GenericFileBrowser)
                 || App.CurrentInstance.CurrentPageType == typeof(GridViewBrowser);
 
-            switch (c: ctrl, s: shift, a: alt, t: tabInstance, k: e.Key)
+            switch (c: ctrl, s: shift, a: alt, t: tabInstance, k: args.KeyboardAccelerator.Key)
             {
                 case (true, true, false, true, VirtualKey.N): // ctrl + shift + n, new item
                     await App.AddItemDialogDisplay.ShowAsync();
@@ -257,6 +258,18 @@ private async void ModernShellPage_KeyUp(object sender, KeyRoutedEventArgs e)
                     App.CurrentInstance.InteractionOperations.CloseTab();
                     break;
 
+                case (true, false, false, true, VirtualKey.N): // ctrl + n, new window from layout mode
+                    App.CurrentInstance.InteractionOperations.LaunchNewWindow();
+                    break;
+
+                case (true, false, false, true, VirtualKey.W): // ctrl + w, close tab from layout mode
+                    App.CurrentInstance.InteractionOperations.CloseTab();
+                    break;
+
+                case (true, false, false, true, VirtualKey.F4): // ctrl + F4, close tab from layout mode
+                    App.CurrentInstance.InteractionOperations.CloseTab();
+                    break;
+
                 case (false, false, false, true, VirtualKey.Delete): // delete, delete item
                     if (App.CurrentInstance.ContentPage.IsItemSelected && !App.CurrentInstance.ContentPage.isRenamingItem)
                         App.CurrentInstance.InteractionOperations.DeleteItem_Click(null, null);
@@ -287,7 +300,7 @@ private async void ModernShellPage_KeyUp(object sender, KeyRoutedEventArgs e)
 
             if (App.CurrentInstance.CurrentPageType == typeof(GridViewBrowser))
             {
-                switch (e.Key)
+                switch (args.KeyboardAccelerator.Key)
                 {
                     case VirtualKey.F2: //F2, rename
                         if (App.CurrentInstance.ContentPage.IsItemSelected)