🎨 Move code to process Loop trigger key presses into its own function

MrKai77 · Sep 15, 2023 · 8fe8d00 · 8fe8d00
1 parent 9783d06
commit 8fe8d00
Showing 1 changed file with 39 additions and 35 deletions.
diff --git a/Loop/Managers/LoopManager.swift b/Loop/Managers/LoopManager.swift
@@ -27,41 +27,7 @@ class LoopManager {
 
     func startObservingKeys() {
         NSEvent.addGlobalMonitorForEvents(matching: NSEvent.EventTypeMask.flagsChanged) { event in
-            if event.keyCode == Defaults[.triggerKey].keycode {
-
-                let useTriggerDelay = Defaults[.triggerDelay] > 0.1
-                let useDoubleClickTrigger = Defaults[.doubleClickToTrigger]
-
-                if event.modifierFlags.rawValue ==  256 {
-                    if useTriggerDelay {
-                        self.cancelTriggerDelayTimer()
-                    }
-                    self.closeLoop()
-                } else {
-                    if useDoubleClickTrigger {
-                        if abs(self.lastTriggerKeyClick.timeIntervalSinceNow) < NSEvent.doubleClickInterval {
-                            if useTriggerDelay {
-                                if self.triggerDelayTimer == nil {
-                                    self.startTriggerDelayTimer(seconds: Defaults[.triggerDelay]) {
-                                        self.openLoop()
-                                    }
-                                }
-                            } else {
-                                self.openLoop()
-                            }
-                        }
-                        self.lastTriggerKeyClick = Date.now
-                    } else if useTriggerDelay {
-                        if self.triggerDelayTimer == nil {
-                            self.startTriggerDelayTimer(seconds: Defaults[.triggerDelay]) {
-                                self.openLoop()
-                            }
-                        }
-                    } else {
-                        self.openLoop()
-                    }
-                }
-            }
+            self.handleLoopKeypress(event)
         }
 
         NotificationCenter.default.addObserver(
@@ -121,6 +87,44 @@ class LoopManager {
         }
     }
 
+    private func handleLoopKeypress(_ event: NSEvent) {
+        if event.keyCode == Defaults[.triggerKey].keycode {
+
+            let useTriggerDelay = Defaults[.triggerDelay] > 0.1
+            let useDoubleClickTrigger = Defaults[.doubleClickToTrigger]
+
+            if event.modifierFlags.rawValue ==  256 {
+                if useTriggerDelay {
+                    self.cancelTriggerDelayTimer()
+                }
+                self.closeLoop()
+            } else {
+                if useDoubleClickTrigger {
+                    if abs(self.lastTriggerKeyClick.timeIntervalSinceNow) < NSEvent.doubleClickInterval {
+                        if useTriggerDelay {
+                            if self.triggerDelayTimer == nil {
+                                self.startTriggerDelayTimer(seconds: Defaults[.triggerDelay]) {
+                                    self.openLoop()
+                                }
+                            }
+                        } else {
+                            self.openLoop()
+                        }
+                    }
+                    self.lastTriggerKeyClick = Date.now
+                } else if useTriggerDelay {
+                    if self.triggerDelayTimer == nil {
+                        self.startTriggerDelayTimer(seconds: Defaults[.triggerDelay]) {
+                            self.openLoop()
+                        }
+                    }
+                } else {
+                    self.openLoop()
+                }
+            }
+        }
+    }
+
     private func openLoop() {
         currentResizingDirection = .noAction
         frontmostWindow = nil