fix: allow Command hints after dismissing Actions with Escape

2026-10-13 23:47:28 +02:00
parent 74d16092bb
commit f3be147423
3 changed files with 8 additions and 3 deletions
@@ -945,11 +945,12 @@ final class LauncherPanel: NSPanel {
        if wasVisible != numberShortcuts.isVisible { numberHintsChanged?() }
    }

-    func resetNumberHints() {
+    func resetNumberHints(modifierFlags: NSEvent.ModifierFlags = NSEvent.modifierFlags) {
        commandHoldTask?.cancel()
        commandHoldTask = nil
        let wasVisible = numberShortcuts.isVisible
-        numberShortcuts.cancel()
+        if commandOnly(modifierFlags) { numberShortcuts.cancel() }
+        else { numberShortcuts.reset() }
        if wasVisible { numberHintsChanged?() }
    }

@@ -999,7 +1000,7 @@ final class LauncherPanel: NSPanel {
                if !event.isARepeat { launchNumber?(index) }
                return
            }
-            resetNumberHints()
+            resetNumberHints(modifierFlags: event.modifierFlags)
        }
        if event.type == .keyDown, attachedSheet == nil,
           event.modifierFlags.intersection([.control, .command, .option, .shift]) == .control {