Merge pull request #1079 from linebender/fix_mods

Compare only base modifiers for hotkey match
linebender · Jul 4, 2020 · 64eb47c · 64eb47c
2 parents d4c575c + 71af454
commit 64eb47c
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/druid-shell/src/hotkey.rs b/druid-shell/src/hotkey.rs
@@ -111,8 +111,10 @@ impl HotKey {
     ///
     /// [`KeyboardEvent`]: keyboard_types::KeyEvent
     pub fn matches(&self, event: impl Borrow<KeyEvent>) -> bool {
+        // Should be a const but const bit_or doesn't work here.
+        let base_mods = Modifiers::SHIFT | Modifiers::CONTROL | Modifiers::ALT | Modifiers::META;
         let event = event.borrow();
-        self.mods == event.mods && self.key == event.key
+        self.mods == event.mods & base_mods && self.key == event.key
     }
 }