From 406c5898d103427193e589b4bbe615d0c739b2c5 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Tue, 02 Jun 2026 19:36:31 +0800
Subject: [PATCH] Prepare 7.8.9 tag navigation drop test package
---
Apptag/ApptagApp.swift | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 76 insertions(+), 7 deletions(-)
diff --git a/Apptag/ApptagApp.swift b/Apptag/ApptagApp.swift
index 7008544..c35007f 100644
--- a/Apptag/ApptagApp.swift
+++ b/Apptag/ApptagApp.swift
@@ -62,6 +62,7 @@
private var lastShowDockIcon: Bool?
private var statusMenuScreenForNextOverlay: NSScreen?
private var suppressReopenUntil = Date.distantPast
+ private var overlayOpenedByQuickSearchOnly = false
private lazy var overlayController = OverlayWindowController(
dependencies: OverlayWindowController.Dependencies(
@@ -106,6 +107,11 @@
self?.removeOverlayKeyMonitor()
},
removeQuickSearchMouseMonitor: { [weak self] in
+ Diagnostics.log("app.quickSearch.removeMouseMonitor", [
+ "quickSearchOpen": self?.isQuickSearchOpen,
+ "quickSearchOnlyOverlaySession": self?.quickSearchOnlyOverlaySession,
+ "quickSearchShouldHideOverlayOnClose": self?.quickSearchShouldHideOverlayOnClose
+ ])
self?.removeQuickSearchExternalMouseMonitor()
self?.quickSearchShouldHideOverlayOnClose = false
self?.quickSearchOnlyOverlaySession = false
@@ -122,7 +128,8 @@
onWillHide: {
TagDatabase.flushPendingCategorySchemeBackupBatch()
},
- onDidHide: {
+ onDidHide: { [weak self] in
+ self?.overlayOpenedByQuickSearchOnly = false
NotificationCenter.default.post(name: .tagLauncherOverlayDidHide, object: nil)
},
onDidShow: {
@@ -220,9 +227,22 @@
return false
}
guard UserDefaults.standard.bool(forKey: Self.showDockIconKey) else { return false }
- guard isPointerNearDockArea() else { return false }
+ guard isRecentUserClickNearDockArea() else { return false }
showOrFocusOverlay()
return false // Suppress default "unhide all windows" behavior
+ }
+
+ private func isRecentUserClickNearDockArea() -> Bool {
+ let lastMouseDown = CGEventSource.secondsSinceLastEventType(
+ .combinedSessionState,
+ eventType: .leftMouseDown
+ )
+ let lastMouseUp = CGEventSource.secondsSinceLastEventType(
+ .combinedSessionState,
+ eventType: .leftMouseUp
+ )
+ let recentMouseClick = min(lastMouseDown, lastMouseUp) < 1.2
+ return recentMouseClick && isPointerNearDockArea()
}
private func isPointerNearDockArea() -> Bool {
@@ -881,10 +901,12 @@
}
private func performToggleOverlay(preferredScreen: NSScreen?) {
+ overlayOpenedByQuickSearchOnly = false
overlayController.toggle(preferredScreen: preferredScreen)
}
private func showOrFocusOverlay(preferredScreen: NSScreen? = nil) {
+ overlayOpenedByQuickSearchOnly = false
overlayController.showOrFocus(preferredScreen: preferredScreen)
}
@@ -893,10 +915,20 @@
preferredScreen: NSScreen? = nil,
stagedForAllSpaces: Bool = false
) {
+ Diagnostics.log("app.overlay.showRequest", [
+ "initialQuickSearchSource": initialQuickSearchSource,
+ "stagedForAllSpaces": stagedForAllSpaces,
+ "isQuickSearchOpen": isQuickSearchOpen,
+ "quickSearchOnlyOverlaySession": quickSearchOnlyOverlaySession,
+ "overlayOpenedByQuickSearchOnly": overlayOpenedByQuickSearchOnly
+ ])
if initialQuickSearchSource == QuickSearchOpenSource.globalHidden {
isQuickSearchOpen = true
quickSearchShouldHideOverlayOnClose = true
quickSearchOnlyOverlaySession = true
+ overlayOpenedByQuickSearchOnly = true
+ } else if initialQuickSearchSource == nil {
+ overlayOpenedByQuickSearchOnly = false
}
overlayController.show(
initialQuickSearchSource: initialQuickSearchSource,
@@ -959,8 +991,9 @@
if shouldHideOverlayAfterDismiss {
quickSearchShouldHideOverlayOnClose = false
quickSearchOnlyOverlaySession = false
+ overlayOpenedByQuickSearchOnly = true
DispatchQueue.main.async { [weak self] in
- self?.hideOverlay(force: true)
+ self?.hideOverlay(force: true, discardWindow: true)
}
}
}
@@ -971,6 +1004,9 @@
|| source == QuickSearchOpenSource.globalHidden
quickSearchOnlyOverlaySession = quickSearchOnlyOverlaySession
|| source == QuickSearchOpenSource.globalHidden
+ if source == QuickSearchOpenSource.globalHidden {
+ overlayOpenedByQuickSearchOnly = true
+ }
promoteOverlayToForegroundInput()
updateOverlayLevelForTextInput()
installQuickSearchExternalMouseMonitor()
@@ -1014,6 +1050,14 @@
}
private func hideOverlay(force: Bool = false, discardWindow: Bool = false) {
+ Diagnostics.log("app.overlay.hideRequest", [
+ "force": force,
+ "discardWindow": discardWindow,
+ "isQuickSearchOpen": isQuickSearchOpen,
+ "quickSearchOnlyOverlaySession": quickSearchOnlyOverlaySession,
+ "quickSearchShouldHideOverlayOnClose": quickSearchShouldHideOverlayOnClose,
+ "overlayOpenedByQuickSearchOnly": overlayOpenedByQuickSearchOnly
+ ])
overlayController.hide(force: force, discardWindow: discardWindow)
}
@@ -1106,6 +1150,13 @@
}
private func handleHotkeyEvent(id: UInt32) {
+ Diagnostics.log("app.hotkey", [
+ "id": id,
+ "isOverlayVisible": isOverlayVisible,
+ "isQuickSearchOpen": isQuickSearchOpen,
+ "quickSearchOnlyOverlaySession": quickSearchOnlyOverlaySession,
+ "overlayOpenedByQuickSearchOnly": overlayOpenedByQuickSearchOnly
+ ])
if id == LauncherHotkeyKind.quickSearch.eventID {
showQuickSearchFromGlobalHotkey()
} else {
@@ -1115,9 +1166,14 @@
private func showQuickSearchFromGlobalHotkey() {
let now = Date()
- if overlayWindow?.isVisible == true, isQuickSearchOpen || quickSearchOnlyOverlaySession {
+ if overlayWindow?.isVisible == true,
+ isQuickSearchOpen || quickSearchOnlyOverlaySession || overlayOpenedByQuickSearchOnly {
lastQuickSearchHotkeyAt = now
- dismissQuickSearchFromKeyboard()
+ if isQuickSearchOpen || quickSearchOnlyOverlaySession {
+ dismissQuickSearchFromKeyboard()
+ } else {
+ hideOverlay(force: true)
+ }
return
}
@@ -1411,10 +1467,23 @@
guard let self else { return }
let active = (notification.userInfo?["active"] as? Bool) ?? false
let hideOverlayOnClose = (notification.userInfo?["hideOverlayOnClose"] as? Bool) ?? false
+ let wasQuickSearchOnlyOverlay = self.quickSearchOnlyOverlaySession
+ || self.quickSearchShouldHideOverlayOnClose
+ || self.overlayOpenedByQuickSearchOnly
+ Diagnostics.log("app.quickSearch.visibilityChanged", [
+ "active": active,
+ "hideOverlayOnClose": hideOverlayOnClose,
+ "isQuickSearchOpenBefore": self.isQuickSearchOpen,
+ "quickSearchOnlyOverlaySessionBefore": self.quickSearchOnlyOverlaySession,
+ "quickSearchShouldHideOverlayOnCloseBefore": self.quickSearchShouldHideOverlayOnClose,
+ "overlayOpenedByQuickSearchOnlyBefore": self.overlayOpenedByQuickSearchOnly,
+ "wasQuickSearchOnlyOverlay": wasQuickSearchOnlyOverlay
+ ])
self.isQuickSearchOpen = active
if active, hideOverlayOnClose {
self.quickSearchShouldHideOverlayOnClose = true
self.quickSearchOnlyOverlaySession = true
+ self.overlayOpenedByQuickSearchOnly = true
}
if self.isQuickSearchOpen {
self.promoteOverlayToForegroundInput()
@@ -1424,10 +1493,10 @@
self.installQuickSearchExternalMouseMonitor()
} else {
self.removeQuickSearchExternalMouseMonitor()
- if hideOverlayOnClose || self.quickSearchShouldHideOverlayOnClose {
+ if hideOverlayOnClose || wasQuickSearchOnlyOverlay {
self.quickSearchShouldHideOverlayOnClose = false
self.quickSearchOnlyOverlaySession = false
- self.hideOverlay(force: true)
+ self.hideOverlay(force: true, discardWindow: wasQuickSearchOnlyOverlay)
}
}
}
--
Gitblit v1.9.3