From 8478c55e513bbbb4b1676d1d9207f7feb2509465 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Fri, 22 May 2026 00:30:57 +0800
Subject: [PATCH] Freeze 7.6.0 release candidate and move docs out of repo
---
Apptag/ApptagApp.swift | 266 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 181 insertions(+), 85 deletions(-)
diff --git a/Apptag/ApptagApp.swift b/Apptag/ApptagApp.swift
index cd12e0b..c030bc6 100644
--- a/Apptag/ApptagApp.swift
+++ b/Apptag/ApptagApp.swift
@@ -29,27 +29,53 @@
final class AppDelegate: NSObject, NSApplicationDelegate {
private static let showDockIconKey = "showDockIcon"
- private static let statusItemAutosaveName = "com.apptag.launcher.statusItem"
+ private static let statusItemAutosaveName = AppIdentity.statusItemAutosaveName
private static let statusItemButtonIdentifier = NSUserInterfaceItemIdentifier("TagLauncherStatusItemButton")
- private static let statusItemAccessibilityLabel = "TagLauncher"
+ private static let statusItemAccessibilityLabel = AppIdentity.displayName
private static let showAppListMenuItemIdentifier = NSUserInterfaceItemIdentifier("TagLauncherShowAppListMenuItem")
- private static let overlayDefaultLevel = NSWindow.Level(rawValue: Int(CGWindowLevelForKey(.maximumWindow)))
- private static let overlayTextInputLevel = NSWindow.Level.modalPanel
+ private static let overlayDefaultLevel = NSWindow.Level.normal
+ private static let overlayTextInputLevel = NSWindow.Level.normal
private var statusItem: NSStatusItem?
private var overlayWindow: NSWindow?
private var overlayKeyMonitor: Any?
+ private var quickSearchExternalMouseMonitor: Any?
private var settingsWindow: NSWindow? // Track Settings window to keep it above overlay
private var mainHotkeyRef: EventHotKeyRef?
private var quickSearchHotkeyRef: EventHotKeyRef?
private var hotkeyEventHandlerInstalled = false
private var isQuickSearchOpen = false
private var isModalInteractionActive = false
- private var areHotkeysPausedForCapture = false
private var isInEditMode = false // Suppress auto-dismiss during editing
private var isEditingAppNote = false
private var isConfiguringApplicationMenu = false
private var lastShowDockIcon: Bool?
+
+ private var isOverlayVisible: Bool {
+ overlayWindow?.isVisible == true
+ }
+
+ private var isSettingsVisible: Bool {
+ settingsWindow?.isVisible == true
+ }
+
+ private var requiresForegroundOwnership: Bool {
+ isOverlayVisible || isSettingsVisible
+ }
+
+ private var currentOverlayLevel: NSWindow.Level {
+ if isEditingAppNote || isQuickSearchOpen {
+ return Self.overlayTextInputLevel
+ }
+ return Self.overlayDefaultLevel
+ }
+
+ private func overlayLevel(initialQuickSearchSource: String? = nil) -> NSWindow.Level {
+ if initialQuickSearchSource != nil {
+ return Self.overlayTextInputLevel
+ }
+ return currentOverlayLevel
+ }
static func refreshChromeSettings() {
(NSApp.delegate as? AppDelegate)?.syncChromeSettings(force: true)
@@ -65,6 +91,7 @@
migrateDefaultGroupName()
TagDatabase.seedDefaultTags()
syncChromeSettings(force: true)
+ observeHotkeyStatusChanges()
registerConfiguredHotkeys()
observeOtherWindows()
observeSettingsClose()
@@ -86,7 +113,12 @@
}
func applicationWillTerminate(_ notification: Notification) {
+ hideOverlay(force: true, discardWindow: true)
+ unregisterHotkey(for: .main)
+ unregisterHotkey(for: .quickSearch)
TagDatabase.flushPendingCategorySchemeBackupBatch()
+ removeOverlayKeyMonitor()
+ removeQuickSearchExternalMouseMonitor()
}
/// Ensure defaultGroupName is always the language-neutral key "Other".
@@ -122,13 +154,59 @@
let dockChanged = lastShowDockIcon != showDock
if force || dockChanged {
- NSApp.setActivationPolicy(showDock ? .regular : .accessory)
lastShowDockIcon = showDock
+ refreshLauncherChromeState()
}
if force {
setupMenuBar()
}
+ }
+
+ private func beginLauncherForegroundOwnership(activate: Bool = true) {
+ if NSApp.activationPolicy() != .regular {
+ NSApp.setActivationPolicy(.regular)
+ }
+ if activate {
+ NSApp.activate(ignoringOtherApps: true)
+ configureApplicationMenuWhenAvailable(retries: 4)
+ }
+ }
+
+ private func refreshLauncherChromeState(activate: Bool = false) {
+ let showDock = UserDefaults.standard.bool(forKey: Self.showDockIconKey)
+ lastShowDockIcon = showDock
+
+ let desiredPolicy: NSApplication.ActivationPolicy = requiresForegroundOwnership
+ ? .regular
+ : (showDock ? .regular : .accessory)
+ if NSApp.activationPolicy() != desiredPolicy {
+ NSApp.setActivationPolicy(desiredPolicy)
+ }
+
+ let desiredPresentation: NSApplication.PresentationOptions = isOverlayVisible ? [.hideDock] : []
+ if NSApp.presentationOptions != desiredPresentation {
+ NSApp.presentationOptions = desiredPresentation
+ }
+
+ if activate && requiresForegroundOwnership {
+ NSApp.activate(ignoringOtherApps: true)
+ configureApplicationMenuWhenAvailable(retries: 4)
+ }
+ }
+
+ private func handleApplicationDidResignActive() {
+ if isQuickSearchOpen {
+ NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
+ }
+
+ guard isOverlayVisible else {
+ refreshLauncherChromeState()
+ return
+ }
+
+ // Once another app takes the menu bar, don't leave the overlay stranded onscreen.
+ hideOverlay(force: true)
}
/// Keep app chrome in sync when language changes from any entry point.
@@ -144,7 +222,7 @@
// MARK: - Launch at Login (LaunchAgent, zero permissions)
- private static let launchAgentLabel = "com.apptag.launcher"
+ private static let launchAgentLabel = AppIdentity.launchAgentLabel
static var supportsLaunchAtLogin: Bool {
ProcessInfo.processInfo.environment["APP_SANDBOX_CONTAINER_ID"] == nil
}
@@ -338,10 +416,10 @@
}
private var showAppListMenuTitle: String {
- if let hotkey = LauncherHotkeyStore.hotkey(for: .main) {
- return "\(tr("menu.showAppList")) \(hotkey.displayString)"
+ if LauncherHotkeyRegistrationStore.state(for: .main) == .failed {
+ return tr("menu.showShortcutUnavailable")
}
- return tr("menu.showAppList")
+ return "\(tr("menu.showAppList")) \(LauncherHotkey.main.displayString)"
}
private func observeApplicationMenuChanges() {
@@ -504,7 +582,7 @@
@objc private func toggleOverlay() {
if overlayWindow?.isVisible == true {
- hideOverlay()
+ hideOverlay(force: true)
} else {
showOverlay()
}
@@ -518,19 +596,45 @@
}) ?? NSScreen.main ?? NSScreen.screens.first else { return }
let window: NSWindow
+ let createdWindow: Bool
if let existingWindow = overlayWindow {
window = existingWindow
+ createdWindow = false
} else {
window = makeOverlayWindow(on: screen, initialQuickSearchSource: initialQuickSearchSource)
overlayWindow = window
+ createdWindow = true
}
- window.setFrame(screen.frame, display: true)
- window.level = isEditingAppNote ? Self.overlayTextInputLevel : Self.overlayDefaultLevel
-
installOverlayKeyMonitor()
+ beginLauncherForegroundOwnership()
- if let initialQuickSearchSource {
+ let targetFrame = screen.frame
+ let targetLevel = overlayLevel(initialQuickSearchSource: initialQuickSearchSource)
+ let canReuseVisibleWindow = !createdWindow
+ && window.isVisible
+ && NSEqualRects(window.frame, targetFrame)
+ && window.level == targetLevel
+
+ if canReuseVisibleWindow {
+ if !window.isKeyWindow {
+ window.makeKeyAndOrderFront(nil)
+ }
+ refreshLauncherChromeState(activate: true)
+ if let initialQuickSearchSource {
+ NotificationCenter.default.post(
+ name: .tagLauncherQuickSearchRequested,
+ object: nil,
+ userInfo: ["source": initialQuickSearchSource]
+ )
+ }
+ return
+ }
+
+ window.setFrame(targetFrame, display: true)
+ window.level = targetLevel
+
+ if let initialQuickSearchSource, !createdWindow {
NotificationCenter.default.post(
name: .tagLauncherQuickSearchRequested,
object: nil,
@@ -540,6 +644,7 @@
window.makeKeyAndOrderFront(nil)
window.orderFrontRegardless()
+ refreshLauncherChromeState(activate: true)
NotificationCenter.default.post(name: .tagLauncherOverlayDidShow, object: nil)
}
@@ -552,7 +657,7 @@
NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
return nil
}
- self.hideOverlay()
+ self.hideOverlay(force: true)
return nil
}
if self.shouldOpenQuickSearch(for: event) {
@@ -610,7 +715,7 @@
private func makeOverlayWindow(on screen: NSScreen, initialQuickSearchSource: String? = nil) -> NSWindow {
let panel = OverlayPanel(
contentRect: screen.frame,
- styleMask: [.borderless, .fullSizeContentView, .nonactivatingPanel],
+ styleMask: [.borderless, .fullSizeContentView],
backing: .buffered,
defer: false
)
@@ -643,7 +748,7 @@
return panel
}
- private func hideOverlay(force: Bool = false) {
+ private func hideOverlay(force: Bool = false, discardWindow: Bool = false) {
guard force || !isInEditMode else { return }
TagDatabase.flushPendingCategorySchemeBackupBatch()
if let settingsWindow, settingsWindow.parent == overlayWindow {
@@ -651,8 +756,10 @@
}
overlayWindow?.orderOut(nil)
removeOverlayKeyMonitor()
+ removeQuickSearchExternalMouseMonitor()
+ refreshLauncherChromeState()
NotificationCenter.default.post(name: .tagLauncherOverlayDidHide, object: nil)
- if force {
+ if discardWindow {
overlayWindow = nil
}
}
@@ -661,28 +768,13 @@
private func registerConfiguredHotkeys() {
installHotkeyEventHandlerIfNeeded()
- registerStoredHotkey(.main)
- registerStoredHotkey(.quickSearch)
+ registerFixedHotkey(.main)
+ registerFixedHotkey(.quickSearch)
}
- @discardableResult
- func applyHotkey(_ hotkey: LauncherHotkey?, for kind: LauncherHotkeyKind) -> Bool {
- installHotkeyEventHandlerIfNeeded()
-
- if hotkey == nil {
- unregisterHotkey(for: kind)
- LauncherHotkeyStore.save(nil, for: kind)
- LauncherHotkeyStore.setStatus(.disabled, message: nil, for: kind)
- return true
- }
-
- guard let hotkey else { return false }
- let previousRef = hotkeyRef(for: kind)
- if previousRef != nil, LauncherHotkeyStore.hotkey(for: kind) == hotkey {
- LauncherHotkeyStore.setStatus(.active, message: nil, for: kind)
- return true
- }
- setHotkeyRef(nil, for: kind)
+ private func registerFixedHotkey(_ kind: LauncherHotkeyKind) {
+ unregisterHotkey(for: kind)
+ let hotkey = kind.hotkey
var hotkeyID = EventHotKeyID()
hotkeyID.signature = OSType(0x41505447) // 'APTG'
@@ -699,31 +791,24 @@
)
if status == noErr, let newRef {
- if let previousRef { UnregisterEventHotKey(previousRef) }
setHotkeyRef(newRef, for: kind)
- LauncherHotkeyStore.save(hotkey, for: kind)
- LauncherHotkeyStore.setStatus(.active, message: nil, for: kind)
- return true
+ LauncherHotkeyRegistrationStore.setActive(for: kind)
+ } else {
+ setHotkeyRef(nil, for: kind)
+ LauncherHotkeyRegistrationStore.setFailed(status, for: kind)
+ print("[TagLauncher] Fixed hotkey registration failed for \(kind.rawValue): \(status)")
}
-
- setHotkeyRef(previousRef, for: kind)
- let message = LauncherHotkeyStore.knownConflictMessage(for: hotkey, status: status)
- ?? tr("quickSearch.hotkeyConflict.generic")
- LauncherHotkeyStore.savePending(hotkey, for: kind)
- LauncherHotkeyStore.setStatus(.conflict, message: message, for: kind)
- print("[TagLauncher] Hotkey registration failed for \(kind.rawValue): \(status)")
- return false
}
- func retryHotkeyRegistration(for kind: LauncherHotkeyKind) {
- _ = applyHotkey(
- LauncherHotkeyStore.pendingHotkey(for: kind) ?? LauncherHotkeyStore.hotkey(for: kind),
- for: kind
- )
- }
-
- private func registerStoredHotkey(_ kind: LauncherHotkeyKind) {
- _ = applyHotkey(LauncherHotkeyStore.hotkey(for: kind), for: kind)
+ private func observeHotkeyStatusChanges() {
+ NotificationCenter.default.addObserver(
+ forName: .tagLauncherHotkeyRegistrationChanged,
+ object: nil,
+ queue: .main
+ ) { [weak self] _ in
+ self?.setupMenuBar()
+ self?.configureApplicationMenuWhenAvailable(retries: 2)
+ }
}
private func installHotkeyEventHandlerIfNeeded() {
@@ -857,6 +942,7 @@
window.makeKeyAndOrderFront(nil)
window.orderFrontRegardless()
settingsWindow = window
+ refreshLauncherChromeState(activate: true)
}
private func attachSettingsWindow(_ window: NSWindow, to overlayWindow: NSWindow) {
@@ -910,6 +996,7 @@
else { return }
self.detachSettingsWindow(closingWindow)
self.settingsWindow = nil
+ self.refreshLauncherChromeState()
}
}
@@ -924,7 +1011,7 @@
}
}
- /// Lower the overlay while editing app notes so IME candidate windows are not hidden behind it.
+ /// Lower the overlay while text input is active so IME and cursor services are not hidden behind it.
private func observeAppNoteEditing() {
NotificationCenter.default.addObserver(
forName: .tagLauncherAppNoteEditingChanged,
@@ -943,7 +1030,14 @@
object: nil,
queue: .main
) { [weak self] notification in
- self?.isQuickSearchOpen = (notification.userInfo?["active"] as? Bool) ?? false
+ guard let self else { return }
+ self.isQuickSearchOpen = (notification.userInfo?["active"] as? Bool) ?? false
+ self.updateOverlayLevelForTextInput()
+ if self.isQuickSearchOpen {
+ self.installQuickSearchExternalMouseMonitor()
+ } else {
+ self.removeQuickSearchExternalMouseMonitor()
+ }
}
NotificationCenter.default.addObserver(
@@ -951,40 +1045,42 @@
object: nil,
queue: .main
) { [weak self] notification in
- guard let self else { return }
- let active = (notification.userInfo?["active"] as? Bool) ?? false
- self.isModalInteractionActive = active
- if (notification.userInfo?["source"] as? String) == "hotkeyRecording" {
- self.setHotkeysPausedForCapture(active)
- }
+ self?.isModalInteractionActive = (notification.userInfo?["active"] as? Bool) ?? false
}
NotificationCenter.default.addObserver(
- forName: .tagLauncherHotkeysChanged,
- object: nil,
+ forName: NSApplication.didResignActiveNotification,
+ object: NSApp,
queue: .main
) { [weak self] _ in
- self?.setupMenuBar()
- self?.configureApplicationMenuWhenAvailable(retries: 2)
+ self?.handleApplicationDidResignActive()
+ }
+ }
+
+ private func installQuickSearchExternalMouseMonitor() {
+ guard quickSearchExternalMouseMonitor == nil else { return }
+ quickSearchExternalMouseMonitor = NSEvent.addGlobalMonitorForEvents(
+ matching: [.leftMouseDown, .rightMouseDown, .otherMouseDown]
+ ) { [weak self] _ in
+ DispatchQueue.main.async {
+ guard self?.isQuickSearchOpen == true else { return }
+ NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
+ }
+ }
+ }
+
+ private func removeQuickSearchExternalMouseMonitor() {
+ if let quickSearchExternalMouseMonitor {
+ NSEvent.removeMonitor(quickSearchExternalMouseMonitor)
+ self.quickSearchExternalMouseMonitor = nil
}
}
private func updateOverlayLevelForTextInput() {
guard let overlayWindow else { return }
- overlayWindow.level = isEditingAppNote ? Self.overlayTextInputLevel : Self.overlayDefaultLevel
+ overlayWindow.level = currentOverlayLevel
if let settingsWindow, settingsWindow.parent == overlayWindow {
settingsWindow.level = overlayWindow.level
- }
- }
-
- private func setHotkeysPausedForCapture(_ paused: Bool) {
- guard areHotkeysPausedForCapture != paused else { return }
- areHotkeysPausedForCapture = paused
- if paused {
- unregisterHotkey(for: .main)
- unregisterHotkey(for: .quickSearch)
- } else {
- registerConfiguredHotkeys()
}
}
@@ -1001,12 +1097,12 @@
@objc private func openPreferences() {
TagDatabase.flushPendingCategorySchemeBackupBatch()
+ beginLauncherForegroundOwnership()
// Don't hide overlay — keep it visible for real-time setting preview.
if let overlayWindow, overlayWindow.isVisible {
overlayWindow.makeKeyAndOrderFront(nil)
overlayWindow.orderFrontRegardless()
}
- NSApp.activate(ignoringOtherApps: true)
if let settingsWindow {
prepareSettingsWindow(settingsWindow)
--
Gitblit v1.9.3