Merge pull request #578 from babackman/master

Allow KeyTrigger to match Alt+Key combinations
Caliburn-Micro · Jan 20, 2019 · f435e3c · f435e3c
2 parents 38e1434 + 5f3641e
commit f435e3c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/samples/scenarios/Scenario.KeyBinding/Input/KeyTrigger.cs b/samples/scenarios/Scenario.KeyBinding/Input/KeyTrigger.cs
@@ -41,7 +41,8 @@ protected override void OnDetaching()
 
         private void OnAssociatedObjectKeyDown(object sender, KeyEventArgs e)
         {
-            if ((e.Key == Key) && (Keyboard.Modifiers == GetActualModifiers(e.Key, Modifiers)))
+            var key = (e.Key == Key.System) ? e.SystemKey : e.Key;
+            if ((key == Key) && (Keyboard.Modifiers == GetActualModifiers(e.Key, Modifiers)))
             {
                 InvokeActions(e);
             }
@@ -70,4 +71,4 @@ static ModifierKeys GetActualModifiers(Key key, ModifierKeys modifiers)
             return modifiers;
         }
     }
-}
+}
diff --git a/samples/scenarios/Scenario.KeyBinding/ViewModels/ShellViewModel.cs b/samples/scenarios/Scenario.KeyBinding/ViewModels/ShellViewModel.cs
@@ -31,5 +31,10 @@ public void CtrlEnterPressed()
         {
             EnterMessage = "Ctrl+Enter has been pressed";
         }
+
+        public void AltEnterPressed()
+        {
+            EnterMessage = "Alt+Enter has been pressed";
+        }
     }
 }
diff --git a/samples/scenarios/Scenario.KeyBinding/Views/ShellView.xaml b/samples/scenarios/Scenario.KeyBinding/Views/ShellView.xaml
@@ -15,7 +15,7 @@
         <TextBlock />
         <TextBox HorizontalAlignment="Left"
              Width="278"
-             cal:Message.Attach="[Key Enter] = [EnterPressed]; [Gesture Ctrl+Enter] = [CtrlEnterPressed]">
+             cal:Message.Attach="[Key Enter] = [EnterPressed]; [Gesture Ctrl+Enter] = [CtrlEnterPressed]; [Gesture Alt+Enter] = [AltEnterPressed]">
         </TextBox>
         <TextBlock />
         <TextBlock x:Name="EnterMessage"