From 0fdcf539329447a3c5e988acde6d18a585c05110 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Thu, 04 Jun 2026 12:29:44 +0800
Subject: [PATCH] Add 7.8.13 App Store candidate package
---
Apptag/ApptagApp.swift | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 154 insertions(+), 19 deletions(-)
diff --git a/Apptag/ApptagApp.swift b/Apptag/ApptagApp.swift
index 6b7c698..a70b9e2 100644
--- a/Apptag/ApptagApp.swift
+++ b/Apptag/ApptagApp.swift
@@ -38,6 +38,7 @@
private static let downloadHelpMenuItemIdentifier = NSUserInterfaceItemIdentifier("TagLauncherDownloadHelpMenuItem")
private static let externalActivationNotification = Notification.Name("TagLauncherExternalActivationRequested")
private static let externalActivationObject = AppIdentity.bundleIdentifier
+ private static let duplicateLaunchSuppressReopenKey = "duplicateLaunchSuppressReopenAt"
private static let launcherOverlayLevel = NSWindow.Level(rawValue: NSWindow.Level.mainMenu.rawValue - 1)
private static let overlayDefaultLevel = launcherOverlayLevel
private static let overlayTextInputLevel = launcherOverlayLevel
@@ -61,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(
@@ -105,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
@@ -121,7 +128,8 @@
onWillHide: {
TagDatabase.flushPendingCategorySchemeBackupBatch()
},
- onDidHide: {
+ onDidHide: { [weak self] in
+ self?.overlayOpenedByQuickSearchOnly = false
NotificationCenter.default.post(name: .tagLauncherOverlayDidHide, object: nil)
},
onDidShow: {
@@ -208,11 +216,52 @@
configureApplicationMenuWhenAvailable(retries: 12)
}
- /// Dock icon click → show overlay (same as menubar "Show TagLauncher")
+ /// Dock icon reopen is an explicit App Grid entry only when the user chooses to show the Dock icon.
+ /// Duplicate-instance handoff suppresses this path so repeated launches do not show App Grid.
func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
guard Date() >= suppressReopenUntil else { return false }
+ let lastDuplicateLaunch = UserDefaults.standard.double(forKey: Self.duplicateLaunchSuppressReopenKey)
+ if lastDuplicateLaunch > 0,
+ Date().timeIntervalSince1970 - lastDuplicateLaunch < 2.0 {
+ suppressReopenUntil = Date().addingTimeInterval(1.0)
+ return false
+ }
+ guard UserDefaults.standard.bool(forKey: Self.showDockIconKey) 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 {
+ let mouse = NSEvent.mouseLocation
+ return NSScreen.screens.contains { screen in
+ let frame = screen.frame
+ let visible = screen.visibleFrame
+ guard NSMouseInRect(mouse, frame, false) else { return false }
+ let bottomDock = visible.minY > frame.minY
+ && mouse.y >= frame.minY
+ && mouse.y <= visible.minY + 24
+ let leftDock = visible.minX > frame.minX
+ && mouse.x >= frame.minX
+ && mouse.x <= visible.minX + 24
+ let rightDock = visible.maxX < frame.maxX
+ && mouse.x <= frame.maxX
+ && mouse.x >= visible.maxX - 24
+ return bottomDock || leftDock || rightDock
+ }
}
func applicationWillTerminate(_ notification: Notification) {
@@ -272,11 +321,17 @@
}
private func beginLauncherForegroundOwnership(activate: Bool = true, keyWindow: NSWindow? = nil) {
- if NSApp.activationPolicy() != .regular {
- NSApp.setActivationPolicy(.regular)
+ let showDock = UserDefaults.standard.bool(forKey: Self.showDockIconKey)
+ let desiredPolicy: NSApplication.ActivationPolicy = showDock ? .regular : .accessory
+ if NSApp.activationPolicy() != desiredPolicy {
+ NSApp.setActivationPolicy(desiredPolicy)
}
- if activate {
+ if activate, showDock {
claimLauncherForeground(keyWindow: keyWindow)
+ } else if activate {
+ NSApp.activate(ignoringOtherApps: true)
+ keyWindow?.makeKeyAndOrderFront(nil)
+ keyWindow?.orderFrontRegardless()
}
}
@@ -335,15 +390,18 @@
let shouldStayAccessoryForCurrentFullscreenSpace = isOverlayVisible
&& (avoidSpaceSwitch || overlayAvoidsSpaceSwitch)
+ let shouldStayAccessoryForHiddenDockChrome = requiresForegroundOwnership
+ && !showDock
let shouldStayAccessoryForQuickOnlySearch = isOverlayVisible
&& quickSearchOnlyOverlaySession
&& !showDock
let desiredPolicy: NSApplication.ActivationPolicy = shouldStayAccessoryForCurrentFullscreenSpace
? .accessory
+ : (shouldStayAccessoryForHiddenDockChrome ? .accessory
: (shouldStayAccessoryForQuickOnlySearch ? .accessory
: (requiresForegroundOwnership
? .regular
- : (showDock ? .regular : .accessory)))
+ : (showDock ? .regular : .accessory))))
if NSApp.activationPolicy() != desiredPolicy {
NSApp.setActivationPolicy(desiredPolicy)
}
@@ -355,6 +413,7 @@
if activate && requiresForegroundOwnership
&& !shouldStayAccessoryForCurrentFullscreenSpace
+ && !shouldStayAccessoryForHiddenDockChrome
&& !shouldStayAccessoryForQuickOnlySearch {
let keyWindow = isSettingsVisible ? settingsWindow : (isOverlayVisible ? overlayWindow : nil)
claimLauncherForeground(
@@ -371,7 +430,11 @@
}
if isQuickSearchOpen {
- NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
+ NotificationCenter.default.post(
+ name: .tagLauncherQuickSearchDismissRequested,
+ object: nil,
+ userInfo: ["source": QuickSearchDismissSource.programmatic]
+ )
}
if !requiresForegroundOwnership {
@@ -842,10 +905,12 @@
}
private func performToggleOverlay(preferredScreen: NSScreen?) {
+ overlayOpenedByQuickSearchOnly = false
overlayController.toggle(preferredScreen: preferredScreen)
}
private func showOrFocusOverlay(preferredScreen: NSScreen? = nil) {
+ overlayOpenedByQuickSearchOnly = false
overlayController.showOrFocus(preferredScreen: preferredScreen)
}
@@ -854,10 +919,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,
@@ -916,12 +991,17 @@
isQuickSearchOpen = false
removeQuickSearchExternalMouseMonitor()
updateOverlayLevelForTextInput()
- NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
+ NotificationCenter.default.post(
+ name: .tagLauncherQuickSearchDismissRequested,
+ object: nil,
+ userInfo: ["source": QuickSearchDismissSource.keyboard]
+ )
if shouldHideOverlayAfterDismiss {
quickSearchShouldHideOverlayOnClose = false
quickSearchOnlyOverlaySession = false
+ overlayOpenedByQuickSearchOnly = true
DispatchQueue.main.async { [weak self] in
- self?.hideOverlay(force: true)
+ self?.hideOverlay(force: true, discardWindow: true)
}
}
}
@@ -932,6 +1012,9 @@
|| source == QuickSearchOpenSource.globalHidden
quickSearchOnlyOverlaySession = quickSearchOnlyOverlaySession
|| source == QuickSearchOpenSource.globalHidden
+ if source == QuickSearchOpenSource.globalHidden {
+ overlayOpenedByQuickSearchOnly = true
+ }
promoteOverlayToForegroundInput()
updateOverlayLevelForTextInput()
installQuickSearchExternalMouseMonitor()
@@ -975,6 +1058,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)
}
@@ -1067,6 +1158,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 {
@@ -1076,9 +1174,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
}
@@ -1372,10 +1475,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()
@@ -1385,10 +1501,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)
}
}
}
@@ -1418,7 +1534,11 @@
) { [weak self] _ in
DispatchQueue.main.async {
guard self?.isQuickSearchOpen == true else { return }
- NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
+ NotificationCenter.default.post(
+ name: .tagLauncherQuickSearchDismissRequested,
+ object: nil,
+ userInfo: ["source": QuickSearchDismissSource.mouse]
+ )
}
}
}
@@ -1430,7 +1550,11 @@
) { [weak self] event in
guard let self, self.isQuickSearchOpen else { return event }
if event.window === self.overlayWindow {
- NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
+ NotificationCenter.default.post(
+ name: .tagLauncherQuickSearchDismissRequested,
+ object: nil,
+ userInfo: ["source": QuickSearchDismissSource.mouse]
+ )
return nil
}
return event
@@ -1477,8 +1601,11 @@
}
@objc private func handleExternalActivationRequest(_ notification: Notification) {
- let shouldShowOverlay = notification.userInfo?["showOverlay"] as? Bool ?? true
- guard shouldShowOverlay else { return }
+ let shouldShowOverlay = notification.userInfo?["showOverlay"] as? Bool ?? false
+ guard shouldShowOverlay else {
+ suppressReopenUntil = Date().addingTimeInterval(1.0)
+ return
+ }
showOrFocusOverlay()
}
@@ -1522,7 +1649,11 @@
updateOverlayLevelForTextInput()
quickSearchShouldHideOverlayOnClose = false
quickSearchOnlyOverlaySession = false
- NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
+ NotificationCenter.default.post(
+ name: .tagLauncherQuickSearchDismissRequested,
+ object: nil,
+ userInfo: ["source": QuickSearchDismissSource.programmatic]
+ )
}
@objc private func switchLanguage(_ sender: NSMenuItem) {
@@ -1584,7 +1715,11 @@
}
if hit == self {
if quickSearchSuppressesBackdropDismiss {
- NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
+ NotificationCenter.default.post(
+ name: .tagLauncherQuickSearchDismissRequested,
+ object: nil,
+ userInfo: ["source": QuickSearchDismissSource.backdrop]
+ )
return
}
if suppressBackdropDismiss {
--
Gitblit v1.9.3