feat: press escape to close preview window

closes #229
ejbills · Aug 16, 2024 · 569a27b · 569a27b
1 parent 39f44f0
commit 569a27b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/DockDoor/Utilities/KeybindHelper.swift b/DockDoor/Utilities/KeybindHelper.swift
@@ -58,7 +58,7 @@ class KeybindHelper {
 
     private func handleEvent(proxy: CGEventTapProxy, type: CGEventType, event: CGEvent) -> Unmanaged<CGEvent>? {
         let keyCode = event.getIntegerValueField(.keyboardEventKeycode)
-        let keyBoardShortcutSaved: UserKeyBind = Defaults[.UserKeybind] // UserDefaults.standard.getKeybind()!
+        let keyBoardShortcutSaved: UserKeyBind = Defaults[.UserKeybind]
         let shiftKeyCurrentlyPressed = event.flags.contains(.maskShift)
         var userDefinedKeyCurrentlyPressed = false
 
@@ -80,6 +80,11 @@ class KeybindHelper {
         }
 
         else if type == .keyDown {
+            if SharedPreviewWindowCoordinator.shared.isVisible && keyCode == 53 { // 53 is the keycode for Escape key
+                SharedPreviewWindowCoordinator.shared.hideWindow()
+                return nil // Suppress the Escape key event
+            }
+
             if (isModifierKeyPressed && keyCode == keyBoardShortcutSaved.keyCode && modifierValue == keyBoardShortcutSaved.modifierFlags) || (Defaults[.defaultCMDTABKeybind] && event.flags.contains(.maskCommand) && keyCode == 48) { // Tab key
                 if SharedPreviewWindowCoordinator.shared.isVisible { // Check if HoverWindow is already shown
                     SharedPreviewWindowCoordinator.shared.cycleWindows(goBackwards: isShiftKeyPressed) // Cycle windows based on Shift key state