From 6f3ed4f3b8eb45734ca77916b4c96fab937cb2e2 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Sun, 31 May 2026 02:58:27 +0800
Subject: [PATCH] Prepare 7.8.7 dock policy release
---
Apptag/ApptagApp.swift | 117 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 89 insertions(+), 28 deletions(-)
diff --git a/Apptag/ApptagApp.swift b/Apptag/ApptagApp.swift
index 40f301b..7008544 100644
--- a/Apptag/ApptagApp.swift
+++ b/Apptag/ApptagApp.swift
@@ -17,7 +17,7 @@
Settings {
PreferencesView()
}
- .defaultSize(width: 880, height: 460)
+ .defaultSize(width: 1000, height: 480)
.commands {
CommandGroup(replacing: .systemServices) { }
CommandGroup(replacing: .appVisibility) { }
@@ -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
@@ -208,11 +209,39 @@
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 isPointerNearDockArea() else { return false }
showOrFocusOverlay()
return false // Suppress default "unhide all windows" behavior
+ }
+
+ 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 +301,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,11 +370,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)
}
@@ -349,7 +391,10 @@
NSApp.presentationOptions = desiredPresentation
}
- if activate && requiresForegroundOwnership && !shouldStayAccessoryForCurrentFullscreenSpace {
+ if activate && requiresForegroundOwnership
+ && !shouldStayAccessoryForCurrentFullscreenSpace
+ && !shouldStayAccessoryForHiddenDockChrome
+ && !shouldStayAccessoryForQuickOnlySearch {
let keyWindow = isSettingsVisible ? settingsWindow : (isOverlayVisible ? overlayWindow : nil)
claimLauncherForeground(
keyWindow: keyWindow,
@@ -894,18 +939,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,
@@ -914,6 +948,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) {
@@ -1066,6 +1115,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()
@@ -1073,11 +1128,6 @@
}
lastQuickSearchHotkeyAt = now
- if overlayWindow?.isVisible == true, isQuickSearchOpen || quickSearchOnlyOverlaySession {
- promoteOverlayToForegroundInput()
- updateOverlayLevelForTextInput()
- return
- }
if overlayWindow?.isVisible == true {
refreshLauncherChromeState(
activate: !overlayAvoidsSpaceSwitch,
@@ -1159,7 +1209,7 @@
/// Settings must always appear centered over the current overlay view and float above it.
private func prepareSettingsWindow(_ window: NSWindow) {
dismissQuickSearchIfNeeded()
- let settingsSize = NSSize(width: 880, height: 460)
+ let settingsSize = NSSize(width: 1000, height: 480)
window.identifier = NSUserInterfaceItemIdentifier("TagLauncherPreferencesWindow")
window.minSize = settingsSize
window.maxSize = settingsSize
@@ -1338,6 +1388,14 @@
overlayWindow.orderFrontRegardless()
return
}
+ if quickSearchOnlyOverlaySession && !UserDefaults.standard.bool(forKey: Self.showDockIconKey) {
+ refreshLauncherChromeState(activate: false)
+ guard let overlayWindow else { return }
+ NSApp.activate(ignoringOtherApps: true)
+ overlayWindow.makeKeyAndOrderFront(nil)
+ overlayWindow.orderFrontRegardless()
+ return
+ }
beginLauncherForegroundOwnership()
guard let overlayWindow else { return }
overlayWindow.makeKeyAndOrderFront(nil)
@@ -1458,8 +1516,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()
}
@@ -1482,7 +1543,7 @@
return
}
- let settingsSize = NSSize(width: 880, height: 460)
+ let settingsSize = NSSize(width: 1000, height: 480)
let window = NSWindow(
contentRect: NSRect(origin: .zero, size: settingsSize),
styleMask: [.titled, .closable],
--
Gitblit v1.9.3