✨ Fix #25

✨ Ability to add trigger delay
MrKai77 · Sep 8, 2023 · b4862a0 · b4862a0
2 parents 9e33f1b + fa71626
commit b4862a0
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/Loop/Extensions/Defaults+Extensions.swift b/Loop/Extensions/Defaults+Extensions.swift
@@ -20,6 +20,7 @@ extension Defaults.Keys {
     static let gradientColor = Key<Color>("gradientColor", default: Color(.black))
 
     static let triggerKey = Key<CGKeyCode>("triggerKey", default: .kVK_Function)
+    static let triggerDelay = Key<Float>("triggerDelay", default: 0)
     static let radialMenuCornerRadius = Key<CGFloat>("radialMenuCornerRadius", default: 50)
     static let radialMenuThickness = Key<CGFloat>("radialMenuThickness", default: 22)
 

diff --git a/Loop/Managers/LoopManager.swift b/Loop/Managers/LoopManager.swift
@@ -22,13 +22,28 @@ class LoopManager {
     private var frontmostWindow: Window?
     private var screenWithMouse: NSScreen?
 
+    private var timer: DispatchSourceTimer?    // Used when user has configured a trigger delay
+
     func startObservingKeys() {
         NSEvent.addGlobalMonitorForEvents(matching: NSEvent.EventTypeMask.flagsChanged) { event -> Void in
             if event.keyCode == Defaults[.triggerKey] {
                 if event.modifierFlags.rawValue == 256 {
-                    self.closeLoop()
+                    if self.timer != nil {
+                        self.timer?.cancel()
+                        self.timer = nil
+                    } else {
+                        self.closeLoop()
+                    }
                 } else {
-                    self.openLoop()
+                    if self.timer == nil {
+                        self.timer = DispatchSource.makeTimerSource(queue: .main)
+                        self.timer!.schedule(deadline: .now() + .milliseconds(Int(Defaults[.triggerDelay]*1000)))
+                        self.timer!.setEventHandler {
+                            self.openLoop()
+                            self.timer = nil
+                        }
+                        self.timer!.resume()
+                    }
                 }
             }
         }

diff --git a/Loop/Settings/KeybindingSettingsView.swift b/Loop/Settings/KeybindingSettingsView.swift
@@ -11,6 +11,7 @@ import Defaults
 struct KeybindingSettingsView: View {
 
     @Default(.triggerKey) var triggerKey
+    @Default(.triggerDelay) var triggerDelay
     @Default(.useSystemAccentColor) var useSystemAccentColor
     @Default(.customAccentColor) var customAccentColor
 
@@ -44,6 +45,21 @@ struct KeybindingSettingsView: View {
                 .onChange(of: triggerKey) { _ in
                     refreshTriggerKeySymbol()
                 }
+
+                HStack {
+                    Stepper(
+                        "Trigger Delay",
+                        value: Binding<Double>(
+                            get: { Double(self.triggerDelay) },
+                            set: { self.triggerDelay = Float($0) }
+                        ),
+                        in: 0...1,
+                        step: 0.1,
+                        format: .number
+                    )
+                    Text("seconds")
+                        .foregroundColor(.secondary)
+                }
             }
 
             Section("Instructions") {