From e47223fbd1a6ec0c1ea417d36c4eff1feee93b81 Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Sat, 30 May 2026 17:01:31 +0800
Subject: [PATCH] Prepare 7.8.3 release package
---
Apptag/ApptagApp.swift | 90 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 80 insertions(+), 10 deletions(-)
diff --git a/Apptag/ApptagApp.swift b/Apptag/ApptagApp.swift
index ccc3c80..6f4c0b3 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) { }
@@ -51,6 +51,9 @@
private var quickSearchHotkeyRef: EventHotKeyRef?
private var hotkeyEventHandlerInstalled = false
private var isQuickSearchOpen = false
+ private var quickSearchShouldHideOverlayOnClose = false
+ private var quickSearchOnlyOverlaySession = false
+ private var lastQuickSearchHotkeyAt = Date.distantPast
private var isModalInteractionActive = false
private var isInEditMode = false // Suppress auto-dismiss during editing
private var isEditingAppNote = false
@@ -103,6 +106,8 @@
},
removeQuickSearchMouseMonitor: { [weak self] in
self?.removeQuickSearchExternalMouseMonitor()
+ self?.quickSearchShouldHideOverlayOnClose = false
+ self?.quickSearchOnlyOverlaySession = false
},
detachSettingsWindow: { [weak self] window in
self?.detachSettingsWindow(window)
@@ -330,11 +335,15 @@
let shouldStayAccessoryForCurrentFullscreenSpace = isOverlayVisible
&& (avoidSpaceSwitch || overlayAvoidsSpaceSwitch)
+ let shouldStayAccessoryForQuickOnlySearch = isOverlayVisible
+ && quickSearchOnlyOverlaySession
+ && !showDock
let desiredPolicy: NSApplication.ActivationPolicy = shouldStayAccessoryForCurrentFullscreenSpace
? .accessory
+ : (shouldStayAccessoryForQuickOnlySearch ? .accessory
: (requiresForegroundOwnership
? .regular
- : (showDock ? .regular : .accessory))
+ : (showDock ? .regular : .accessory)))
if NSApp.activationPolicy() != desiredPolicy {
NSApp.setActivationPolicy(desiredPolicy)
}
@@ -344,7 +353,9 @@
NSApp.presentationOptions = desiredPresentation
}
- if activate && requiresForegroundOwnership && !shouldStayAccessoryForCurrentFullscreenSpace {
+ if activate && requiresForegroundOwnership
+ && !shouldStayAccessoryForCurrentFullscreenSpace
+ && !shouldStayAccessoryForQuickOnlySearch {
let keyWindow = isSettingsVisible ? settingsWindow : (isOverlayVisible ? overlayWindow : nil)
claimLauncherForeground(
keyWindow: keyWindow,
@@ -843,6 +854,11 @@
preferredScreen: NSScreen? = nil,
stagedForAllSpaces: Bool = false
) {
+ if initialQuickSearchSource == QuickSearchOpenSource.globalHidden {
+ isQuickSearchOpen = true
+ quickSearchShouldHideOverlayOnClose = true
+ quickSearchOnlyOverlaySession = true
+ }
overlayController.show(
initialQuickSearchSource: initialQuickSearchSource,
preferredScreen: preferredScreen,
@@ -863,9 +879,14 @@
@discardableResult
private func handleOverlayKeyEvent(_ event: NSEvent) -> Bool {
- guard event.type == .keyDown,
- shouldHandleOverlayKeyEvent(event)
- else { return false }
+ guard event.type == .keyDown else { return false }
+
+ if event.keyCode == UInt16(kVK_Escape),
+ isQuickSearchOpen || quickSearchOnlyOverlaySession {
+ return handleOverlayEscapeKey()
+ }
+
+ guard shouldHandleOverlayKeyEvent(event) else { return false }
if event.keyCode == UInt16(kVK_Escape) {
return handleOverlayEscapeKey()
@@ -878,11 +899,19 @@
}
private func handleOverlayEscapeKey() -> Bool {
- if isQuickSearchOpen {
+ 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)
+ }
+ }
return true
}
guard !isSettingsVisible,
@@ -895,6 +924,10 @@
private func requestQuickSearch(source: String) {
isQuickSearchOpen = true
+ quickSearchShouldHideOverlayOnClose = quickSearchShouldHideOverlayOnClose
+ || source == QuickSearchOpenSource.globalHidden
+ quickSearchOnlyOverlaySession = quickSearchOnlyOverlaySession
+ || source == QuickSearchOpenSource.globalHidden
promoteOverlayToForegroundInput()
updateOverlayLevelForTextInput()
installQuickSearchExternalMouseMonitor()
@@ -1038,6 +1071,19 @@
}
private func showQuickSearchFromGlobalHotkey() {
+ let now = Date()
+ if now.timeIntervalSince(lastQuickSearchHotkeyAt) < 0.28 {
+ promoteOverlayToForegroundInput()
+ updateOverlayLevelForTextInput()
+ return
+ }
+ lastQuickSearchHotkeyAt = now
+
+ if overlayWindow?.isVisible == true, isQuickSearchOpen || quickSearchOnlyOverlaySession {
+ promoteOverlayToForegroundInput()
+ updateOverlayLevelForTextInput()
+ return
+ }
if overlayWindow?.isVisible == true {
refreshLauncherChromeState(
activate: !overlayAvoidsSpaceSwitch,
@@ -1046,6 +1092,9 @@
requestQuickSearch(source: QuickSearchOpenSource.globalVisible)
return
}
+ isQuickSearchOpen = true
+ quickSearchShouldHideOverlayOnClose = true
+ quickSearchOnlyOverlaySession = true
showOverlay(initialQuickSearchSource: QuickSearchOpenSource.globalHidden)
}
@@ -1116,7 +1165,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
@@ -1295,6 +1344,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)
@@ -1308,7 +1365,13 @@
queue: .main
) { [weak self] notification in
guard let self else { return }
- self.isQuickSearchOpen = (notification.userInfo?["active"] as? Bool) ?? false
+ let active = (notification.userInfo?["active"] as? Bool) ?? false
+ let hideOverlayOnClose = (notification.userInfo?["hideOverlayOnClose"] as? Bool) ?? false
+ self.isQuickSearchOpen = active
+ if active, hideOverlayOnClose {
+ self.quickSearchShouldHideOverlayOnClose = true
+ self.quickSearchOnlyOverlaySession = true
+ }
if self.isQuickSearchOpen {
self.promoteOverlayToForegroundInput()
}
@@ -1317,6 +1380,11 @@
self.installQuickSearchExternalMouseMonitor()
} else {
self.removeQuickSearchExternalMouseMonitor()
+ if hideOverlayOnClose || self.quickSearchShouldHideOverlayOnClose {
+ self.quickSearchShouldHideOverlayOnClose = false
+ self.quickSearchOnlyOverlaySession = false
+ self.hideOverlay(force: true)
+ }
}
}
@@ -1428,7 +1496,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],
@@ -1447,6 +1515,8 @@
isQuickSearchOpen = false
removeQuickSearchExternalMouseMonitor()
updateOverlayLevelForTextInput()
+ quickSearchShouldHideOverlayOnClose = false
+ quickSearchOnlyOverlaySession = false
NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
}
--
Gitblit v1.9.3