🐛 #261 Fix compatibility with Hyperkey

MrKai77 · Mar 21, 2024 · 5da35d9 · 5da35d9
1 parent 15cf637
commit 5da35d9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/Loop/Managers/LoopManager.swift b/Loop/Managers/LoopManager.swift
@@ -313,6 +313,14 @@ class LoopManager: ObservableObject {
         } else {
             self.currentlyPressedModifiers.insert(event.keyCode)
         }
+
+        // Backup system in case keys are pressed at the exact same time
+        let flags = event.modifierFlags.convertToCGKeyCode()
+        if flags.count > 1 && !self.currentlyPressedModifiers.contains(flags) {
+            for key in flags where CGKeyCode.keyToImage.contains(where: { $0.key == key }) {
+                self.currentlyPressedModifiers.insert(key)
+            }
+        }
     }
 
     private func openLoop() {

diff --git a/Loop/Settings/Keybindings/Keybind Recorder/TriggerKeycorder.swift b/Loop/Settings/Keybindings/Keybind Recorder/TriggerKeycorder.swift
@@ -111,6 +111,17 @@ struct TriggerKeycorder: View {
                 }
             }
 
+            // Backup system in case keys are pressed at the exact same time
+            let flags = event.modifierFlags.convertToCGKeyCode()
+            if flags.count > 1 && !self.selectionKey.contains(flags) {
+                for key in flags where CGKeyCode.keyToImage.contains(where: { $0.key == key }) {
+                    self.selectionKey.insert(key)
+                    withAnimation(.snappy(duration: 0.1)) {
+                        self.isCurrentlyPressed = true
+                    }
+                }
+            }
+
             if event.modifierFlags.wasKeyUp && !self.selectionKey.isEmpty {
                 self.finishedObservingKeys()
                 return