From 2ed5586d3c48d78c4dc9ad1ef00b2e47f7238915 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Sat, 30 May 2026 17:34:47 +0800
Subject: [PATCH] Prepare 7.8.4 quick search toggle release
---
Apptag/ApptagApp.swift | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/Apptag/ApptagApp.swift b/Apptag/ApptagApp.swift
index 6f4c0b3..6b7c698 100644
--- a/Apptag/ApptagApp.swift
+++ b/Apptag/ApptagApp.swift
@@ -900,18 +900,7 @@
private func handleOverlayEscapeKey() -> Bool {
if isQuickSearchOpen || quickSearchOnlyOverlaySession {
- let shouldHideOverlayAfterDismiss = quickSearchShouldHideOverlayOnClose || quickSearchOnlyOverlaySession
- isQuickSearchOpen = false
- removeQuickSearchExternalMouseMonitor()
- updateOverlayLevelForTextInput()
- NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
- if shouldHideOverlayAfterDismiss {
- quickSearchShouldHideOverlayOnClose = false
- quickSearchOnlyOverlaySession = false
- DispatchQueue.main.async { [weak self] in
- self?.hideOverlay(force: true)
- }
- }
+ dismissQuickSearchFromKeyboard()
return true
}
guard !isSettingsVisible,
@@ -920,6 +909,21 @@
else { return false }
hideOverlay(force: true)
return true
+ }
+
+ private func dismissQuickSearchFromKeyboard() {
+ let shouldHideOverlayAfterDismiss = quickSearchShouldHideOverlayOnClose || quickSearchOnlyOverlaySession
+ isQuickSearchOpen = false
+ removeQuickSearchExternalMouseMonitor()
+ updateOverlayLevelForTextInput()
+ NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
+ if shouldHideOverlayAfterDismiss {
+ quickSearchShouldHideOverlayOnClose = false
+ quickSearchOnlyOverlaySession = false
+ DispatchQueue.main.async { [weak self] in
+ self?.hideOverlay(force: true)
+ }
+ }
}
private func requestQuickSearch(source: String) {
@@ -1072,6 +1076,12 @@
private func showQuickSearchFromGlobalHotkey() {
let now = Date()
+ if overlayWindow?.isVisible == true, isQuickSearchOpen || quickSearchOnlyOverlaySession {
+ lastQuickSearchHotkeyAt = now
+ dismissQuickSearchFromKeyboard()
+ return
+ }
+
if now.timeIntervalSince(lastQuickSearchHotkeyAt) < 0.28 {
promoteOverlayToForegroundInput()
updateOverlayLevelForTextInput()
@@ -1079,11 +1089,6 @@
}
lastQuickSearchHotkeyAt = now
- if overlayWindow?.isVisible == true, isQuickSearchOpen || quickSearchOnlyOverlaySession {
- promoteOverlayToForegroundInput()
- updateOverlayLevelForTextInput()
- return
- }
if overlayWindow?.isVisible == true {
refreshLauncherChromeState(
activate: !overlayAvoidsSpaceSwitch,
--
Gitblit v1.9.3