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 | 661 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 405 insertions(+), 256 deletions(-)
diff --git a/Apptag/ApptagApp.swift b/Apptag/ApptagApp.swift
index a4b4f7a..a70b9e2 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) { }
@@ -27,15 +27,6 @@
}
// MARK: - App Delegate (menubar + overlay window + hotkey)
-
-final class OverlayPanel: NSPanel {
- override var canBecomeKey: Bool { true }
- override var canBecomeMain: Bool { true }
-
- override func constrainFrameRect(_ frameRect: NSRect, to screen: NSScreen?) -> NSRect {
- frameRect
- }
-}
final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
private static let showDockIconKey = "showDockIcon"
@@ -47,31 +38,117 @@
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
private var statusItem: NSStatusItem?
- private var overlayWindow: NSWindow?
private var overlayKeyMonitor: Any?
+ private var quickSearchLocalMouseMonitor: 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 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
private var isConfiguringApplicationMenu = false
private var lastShowDockIcon: Bool?
private var statusMenuScreenForNextOverlay: NSScreen?
- private var overlayGeneration = 0
private var suppressReopenUntil = Date.distantPast
+ private var overlayOpenedByQuickSearchOnly = false
- private struct OverlayPlacementContext {
- let screen: NSScreen
- let frame: NSRect
+ private lazy var overlayController = OverlayWindowController(
+ dependencies: OverlayWindowController.Dependencies(
+ shouldStageAsAccessory: { [weak self] in
+ self?.shouldStageOverlayAsAccessory ?? false
+ },
+ isSettingsVisible: { [weak self] in
+ self?.isSettingsVisible ?? false
+ },
+ settingsWindow: { [weak self] in
+ self?.settingsWindow
+ },
+ canHideOverlay: { [weak self] in
+ self?.isInEditMode == false
+ },
+ currentOverlayLevel: { [weak self] in
+ self?.currentOverlayLevel ?? Self.overlayDefaultLevel
+ },
+ overlayLevel: { [weak self] initialQuickSearchSource in
+ self?.overlayLevel(initialQuickSearchSource: initialQuickSearchSource) ?? Self.overlayDefaultLevel
+ },
+ makeContentView: { [weak self] initialQuickSearchSource in
+ DismissibleHostingView(
+ rootView: ContentView(
+ hideOverlay: { [weak self] in
+ self?.hideOverlay(force: true)
+ },
+ initialQuickSearchSource: initialQuickSearchSource
+ ),
+ onBackdropTap: { [weak self] in
+ self?.hideOverlay()
+ }
+ )
+ },
+ handleOverlayKeyEvent: { [weak self] event in
+ self?.handleOverlayKeyEvent(event) ?? false
+ },
+ installOverlayKeyMonitor: { [weak self] in
+ self?.installOverlayKeyMonitor()
+ },
+ removeOverlayKeyMonitor: { [weak self] in
+ 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
+ },
+ detachSettingsWindow: { [weak self] window in
+ self?.detachSettingsWindow(window)
+ },
+ prepareSettingsWindow: { [weak self] window in
+ self?.prepareSettingsWindow(window)
+ },
+ refreshChromeState: { [weak self] activate, avoidSpaceSwitch in
+ self?.refreshLauncherChromeState(activate: activate, avoidSpaceSwitch: avoidSpaceSwitch)
+ },
+ onWillHide: {
+ TagDatabase.flushPendingCategorySchemeBackupBatch()
+ },
+ onDidHide: { [weak self] in
+ self?.overlayOpenedByQuickSearchOnly = false
+ NotificationCenter.default.post(name: .tagLauncherOverlayDidHide, object: nil)
+ },
+ onDidShow: {
+ NotificationCenter.default.post(name: .tagLauncherOverlayDidShow, object: nil)
+ }
+ )
+ )
+
+ private var overlayWindow: NSWindow? {
+ overlayController.window
+ }
+
+ private var overlayGeneration: Int {
+ overlayController.generation
+ }
+
+ private var overlayAvoidsSpaceSwitch: Bool {
+ get { overlayController.avoidsSpaceSwitch }
+ set { overlayController.avoidsSpaceSwitch = newValue }
}
private var isOverlayVisible: Bool {
@@ -139,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) {
@@ -203,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()
}
}
@@ -264,14 +388,20 @@
let showDock = UserDefaults.standard.bool(forKey: Self.showDockIconKey)
lastShowDockIcon = showDock
- let shouldStayAccessoryForCurrentFullscreenSpace = avoidSpaceSwitch
- && isOverlayVisible
- && !isSettingsVisible
+ 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)
}
@@ -281,7 +411,10 @@
NSApp.presentationOptions = desiredPresentation
}
- if activate && requiresForegroundOwnership && !shouldStayAccessoryForCurrentFullscreenSpace {
+ if activate && requiresForegroundOwnership
+ && !shouldStayAccessoryForCurrentFullscreenSpace
+ && !shouldStayAccessoryForHiddenDockChrome
+ && !shouldStayAccessoryForQuickOnlySearch {
let keyWindow = isSettingsVisible ? settingsWindow : (isOverlayVisible ? overlayWindow : nil)
claimLauncherForeground(
keyWindow: keyWindow,
@@ -297,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 {
@@ -481,7 +618,7 @@
}
func menuWillOpen(_ menu: NSMenu) {
- statusMenuScreenForNextOverlay = screenContainingCurrentPointer()
+ statusMenuScreenForNextOverlay = overlayController.screenContainingCurrentPointer()
?? statusItem?.button?.window?.screen
?? NSScreen.main
?? NSScreen.screens.first
@@ -768,36 +905,13 @@
}
private func performToggleOverlay(preferredScreen: NSScreen?) {
- if overlayWindow?.isVisible == true {
- hideOverlay(force: true)
- } else {
- showOverlay(preferredScreen: preferredScreen)
- }
+ overlayOpenedByQuickSearchOnly = false
+ overlayController.toggle(preferredScreen: preferredScreen)
}
private func showOrFocusOverlay(preferredScreen: NSScreen? = nil) {
- let placement = overlayPlacementContextForNextOverlay(preferredScreen: preferredScreen)
- let shouldAvoidSpaceSwitch = placement.map { hasFullscreenWindowOnScreen($0.screen) } ?? false
- if let overlayWindow, overlayWindow.isVisible {
- moveOverlayToCurrentPlacement(preferredScreen: preferredScreen)
- overlayWindow.level = currentOverlayLevel
- refreshLauncherChromeState(activate: !shouldAvoidSpaceSwitch, avoidSpaceSwitch: shouldAvoidSpaceSwitch)
- overlayWindow.makeKeyAndOrderFront(nil)
- overlayWindow.orderFrontRegardless()
- if let settingsWindow, settingsWindow.isVisible {
- prepareSettingsWindow(settingsWindow)
- }
- return
- }
- showOverlay(preferredScreen: preferredScreen)
- }
-
- private func moveOverlayToCurrentPlacement(preferredScreen: NSScreen?) {
- guard let overlayWindow,
- let placement = overlayPlacementContextForNextOverlay(preferredScreen: preferredScreen),
- overlayWindow.frame != placement.frame
- else { return }
- overlayWindow.setFrame(placement.frame, display: true)
+ overlayOpenedByQuickSearchOnly = false
+ overlayController.showOrFocus(preferredScreen: preferredScreen)
}
private func showOverlay(
@@ -805,143 +919,102 @@
preferredScreen: NSScreen? = nil,
stagedForAllSpaces: Bool = false
) {
- guard let placement = overlayPlacementContextForNextOverlay(preferredScreen: preferredScreen) else { return }
-
- let shouldAvoidSpaceSwitch = hasFullscreenWindowOnScreen(placement.screen)
- let shouldStageAsAccessory = shouldStageOverlayAsAccessory || shouldAvoidSpaceSwitch
-
- if !stagedForAllSpaces && shouldStageAsAccessory {
- // Let the all-spaces panel attach to the pointer's display before the app reclaims focus.
- if NSApp.activationPolicy() != .accessory {
- NSApp.setActivationPolicy(.accessory)
- }
- if NSApp.isActive {
- NSApp.deactivate()
- }
- DispatchQueue.main.asyncAfter(deadline: .now() + 0.08) { [weak self] in
- self?.showOverlay(
- initialQuickSearchSource: initialQuickSearchSource,
- preferredScreen: placement.screen,
- stagedForAllSpaces: true
- )
- }
- return
+ 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
}
-
- if overlayWindow?.isVisible == true {
- hideOverlay(force: true)
- } else if let existingWindow = overlayWindow {
- existingWindow.orderOut(nil)
- overlayWindow = nil
- }
-
- let window = makeOverlayWindow(
- on: placement.screen,
- initialQuickSearchSource: initialQuickSearchSource
+ overlayController.show(
+ initialQuickSearchSource: initialQuickSearchSource,
+ preferredScreen: preferredScreen,
+ stagedForAllSpaces: stagedForAllSpaces
)
- overlayGeneration &+= 1
- overlayWindow = window
- installOverlayKeyMonitor()
- if shouldStageAsAccessory {
- if NSApp.isActive {
- NSApp.deactivate()
- }
- if NSApp.activationPolicy() != .accessory {
- NSApp.setActivationPolicy(.accessory)
- }
- }
-
- let targetLevel = overlayLevel(initialQuickSearchSource: initialQuickSearchSource)
- window.setFrame(placement.frame, display: true)
- window.level = targetLevel
-
- window.makeKeyAndOrderFront(nil)
- window.orderFrontRegardless()
-
- let placementFrame = placement.frame
- let finishForegroundClaim: () -> Void = { [weak self, weak window] in
- guard let self, let window, self.overlayWindow === window else { return }
- self.refreshLauncherChromeState(activate: !shouldAvoidSpaceSwitch, avoidSpaceSwitch: shouldAvoidSpaceSwitch)
- if window.frame != placementFrame {
- window.setFrame(placementFrame, display: true)
- window.makeKeyAndOrderFront(nil)
- window.orderFrontRegardless()
- }
- if let settingsWindow = self.settingsWindow, settingsWindow.isVisible {
- self.prepareSettingsWindow(settingsWindow)
- }
- NotificationCenter.default.post(name: .tagLauncherOverlayDidShow, object: nil)
- }
-
- if !isSettingsVisible {
- DispatchQueue.main.asyncAfter(deadline: .now() + 0.12, execute: finishForegroundClaim)
- } else {
- finishForegroundClaim()
- }
- }
-
- private func hasFullscreenWindowOnScreen(_ screen: NSScreen) -> Bool {
- let screenFrame = screen.frame
- let windows = CGWindowListCopyWindowInfo([.optionOnScreenOnly, .excludeDesktopElements], kCGNullWindowID) as? [[String: Any]] ?? []
- return windows.contains { info in
- guard let owner = info[kCGWindowOwnerName as String] as? String,
- owner != AppIdentity.displayName,
- owner != "Window Server",
- owner != "Dock",
- owner != "loginwindow",
- let layer = info[kCGWindowLayer as String] as? Int,
- layer == 0,
- let bounds = info[kCGWindowBounds as String] as? NSDictionary
- else { return false }
-
- let x = cgWindowDimension(bounds, "X")
- let y = cgWindowDimension(bounds, "Y")
- let width = cgWindowDimension(bounds, "Width")
- let height = cgWindowDimension(bounds, "Height")
- let windowFrame = NSRect(x: x, y: y, width: width, height: height)
- let widthMatches = abs(windowFrame.width - screenFrame.width) <= 12
- let heightMatches = windowFrame.height >= screenFrame.height * 0.88
- let horizontallyAligned = abs(windowFrame.midX - screenFrame.midX) <= 12
- return widthMatches && heightMatches && horizontallyAligned
- }
- }
-
- private func cgWindowDimension(_ bounds: NSDictionary, _ key: String) -> CGFloat {
- if let value = bounds[key] as? CGFloat {
- return value
- }
- if let value = bounds[key] as? NSNumber {
- return CGFloat(truncating: value)
- }
- return 0
}
private func installOverlayKeyMonitor() {
guard overlayKeyMonitor == nil else { return }
overlayKeyMonitor = NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
guard let self else { return event }
- guard self.shouldHandleOverlayKeyEvent(event) else { return event }
- if event.keyCode == 53 { // Escape
- if self.isQuickSearchOpen {
- self.isQuickSearchOpen = false
- self.removeQuickSearchExternalMouseMonitor()
- self.updateOverlayLevelForTextInput()
- NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
- return nil
- }
- self.hideOverlay(force: true)
- return nil
- }
- if self.shouldOpenQuickSearch(for: event) {
- self.requestQuickSearch(source: QuickSearchOpenSource.mainOverlay)
+ if self.handleOverlayKeyEvent(event) {
return nil
}
return event
}
}
+ @discardableResult
+ private func handleOverlayKeyEvent(_ event: NSEvent) -> Bool {
+ 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()
+ }
+ if shouldOpenQuickSearch(for: event) {
+ requestQuickSearch(source: QuickSearchOpenSource.mainOverlay)
+ return true
+ }
+ return false
+ }
+
+ private func handleOverlayEscapeKey() -> Bool {
+ if isQuickSearchOpen || quickSearchOnlyOverlaySession {
+ dismissQuickSearchFromKeyboard()
+ return true
+ }
+ guard !isSettingsVisible,
+ !isEditingAppNote,
+ !isModalInteractionActive
+ 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,
+ userInfo: ["source": QuickSearchDismissSource.keyboard]
+ )
+ if shouldHideOverlayAfterDismiss {
+ quickSearchShouldHideOverlayOnClose = false
+ quickSearchOnlyOverlaySession = false
+ overlayOpenedByQuickSearchOnly = true
+ DispatchQueue.main.async { [weak self] in
+ self?.hideOverlay(force: true, discardWindow: true)
+ }
+ }
+ }
+
private func requestQuickSearch(source: String) {
isQuickSearchOpen = true
+ quickSearchShouldHideOverlayOnClose = quickSearchShouldHideOverlayOnClose
+ || source == QuickSearchOpenSource.globalHidden
+ quickSearchOnlyOverlaySession = quickSearchOnlyOverlaySession
+ || source == QuickSearchOpenSource.globalHidden
+ if source == QuickSearchOpenSource.globalHidden {
+ overlayOpenedByQuickSearchOnly = true
+ }
promoteOverlayToForegroundInput()
updateOverlayLevelForTextInput()
installQuickSearchExternalMouseMonitor()
@@ -984,59 +1057,16 @@
}
}
- private func makeOverlayWindow(on screen: NSScreen, initialQuickSearchSource: String? = nil) -> NSWindow {
- let panel = OverlayPanel(
- contentRect: screen.frame,
- styleMask: [.borderless, .fullSizeContentView, .nonactivatingPanel],
- backing: .buffered,
- defer: false
- )
- panel.isFloatingPanel = true
- panel.hidesOnDeactivate = false
- // Keep the overlay publishable above fullscreen Spaces without asking
- // AppKit to migrate an all-spaces window between Spaces.
- panel.collectionBehavior = [
- .canJoinAllSpaces,
- .fullScreenAuxiliary,
- .stationary,
- .transient,
- .ignoresCycle
- ]
- panel.isOpaque = false
- panel.backgroundColor = NSColor.black.withAlphaComponent(0.001)
- panel.hasShadow = false
- panel.titlebarAppearsTransparent = true
- panel.titleVisibility = .hidden
- panel.isReleasedWhenClosed = false
- panel.contentView = DismissibleHostingView(
- rootView: ContentView(
- hideOverlay: { [weak self] in
- self?.hideOverlay(force: true)
- },
- initialQuickSearchSource: initialQuickSearchSource
- ),
- onBackdropTap: { [weak self] in
- self?.hideOverlay()
- }
- )
- return panel
- }
-
private func hideOverlay(force: Bool = false, discardWindow: Bool = false) {
- guard force || !isInEditMode else { return }
- overlayGeneration &+= 1
- TagDatabase.flushPendingCategorySchemeBackupBatch()
- if let settingsWindow, settingsWindow.parent == overlayWindow {
- detachSettingsWindow(settingsWindow)
- }
- overlayWindow?.orderOut(nil)
- removeOverlayKeyMonitor()
- removeQuickSearchExternalMouseMonitor()
- refreshLauncherChromeState()
- NotificationCenter.default.post(name: .tagLauncherOverlayDidHide, object: nil)
- if discardWindow {
- overlayWindow = nil
- }
+ Diagnostics.log("app.overlay.hideRequest", [
+ "force": force,
+ "discardWindow": discardWindow,
+ "isQuickSearchOpen": isQuickSearchOpen,
+ "quickSearchOnlyOverlaySession": quickSearchOnlyOverlaySession,
+ "quickSearchShouldHideOverlayOnClose": quickSearchShouldHideOverlayOnClose,
+ "overlayOpenedByQuickSearchOnly": overlayOpenedByQuickSearchOnly
+ ])
+ overlayController.hide(force: force, discardWindow: discardWindow)
}
// MARK: - Global Hotkeys
@@ -1128,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 {
@@ -1136,11 +1173,36 @@
}
private func showQuickSearchFromGlobalHotkey() {
+ let now = Date()
+ if overlayWindow?.isVisible == true,
+ isQuickSearchOpen || quickSearchOnlyOverlaySession || overlayOpenedByQuickSearchOnly {
+ lastQuickSearchHotkeyAt = now
+ if isQuickSearchOpen || quickSearchOnlyOverlaySession {
+ dismissQuickSearchFromKeyboard()
+ } else {
+ hideOverlay(force: true)
+ }
+ return
+ }
+
+ if now.timeIntervalSince(lastQuickSearchHotkeyAt) < 0.28 {
+ promoteOverlayToForegroundInput()
+ updateOverlayLevelForTextInput()
+ return
+ }
+ lastQuickSearchHotkeyAt = now
+
if overlayWindow?.isVisible == true {
- refreshLauncherChromeState(activate: true)
+ refreshLauncherChromeState(
+ activate: !overlayAvoidsSpaceSwitch,
+ avoidSpaceSwitch: overlayAvoidsSpaceSwitch
+ )
requestQuickSearch(source: QuickSearchOpenSource.globalVisible)
return
}
+ isQuickSearchOpen = true
+ quickSearchShouldHideOverlayOnClose = true
+ quickSearchOnlyOverlaySession = true
showOverlay(initialQuickSearchSource: QuickSearchOpenSource.globalHidden)
}
@@ -1210,7 +1272,8 @@
/// Settings must always appear centered over the current overlay view and float above it.
private func prepareSettingsWindow(_ window: NSWindow) {
- let settingsSize = NSSize(width: 880, height: 460)
+ dismissQuickSearchIfNeeded()
+ let settingsSize = NSSize(width: 1000, height: 480)
window.identifier = NSUserInterfaceItemIdentifier("TagLauncherPreferencesWindow")
window.minSize = settingsSize
window.maxSize = settingsSize
@@ -1233,12 +1296,20 @@
var behavior = window.collectionBehavior
behavior.remove(.canJoinAllSpaces)
- behavior.formUnion([.fullScreenAuxiliary, .moveToActiveSpace])
+ if overlayAvoidsSpaceSwitch {
+ behavior.remove(.moveToActiveSpace)
+ behavior.formUnion([.fullScreenAuxiliary, .stationary, .transient, .ignoresCycle])
+ } else {
+ behavior.formUnion([.fullScreenAuxiliary, .moveToActiveSpace])
+ }
window.collectionBehavior = behavior
window.makeKeyAndOrderFront(nil)
window.orderFrontRegardless()
settingsWindow = window
- refreshLauncherChromeState(activate: true)
+ refreshLauncherChromeState(
+ activate: !overlayAvoidsSpaceSwitch,
+ avoidSpaceSwitch: overlayAvoidsSpaceSwitch
+ )
}
private func attachSettingsWindow(_ window: NSWindow, to overlayWindow: NSWindow) {
@@ -1317,24 +1388,7 @@
}
private func screenUnderMouse() -> NSScreen? {
- overlayPlacementContextForNextOverlay(preferredScreen: nil)?.screen
- }
-
- private func overlayPlacementContextForNextOverlay(preferredScreen: NSScreen?) -> OverlayPlacementContext? {
- if let screen = preferredScreen {
- return OverlayPlacementContext(screen: screen, frame: screen.frame)
- }
- guard let screen = screenContainingCurrentPointer() ?? NSScreen.main ?? NSScreen.screens.first else {
- return nil
- }
- return OverlayPlacementContext(screen: screen, frame: screen.frame)
- }
-
- private func screenContainingCurrentPointer() -> NSScreen? {
- let mousePoint = NSEvent.mouseLocation
- return NSScreen.screens.first(where: {
- NSMouseInRect(mousePoint, $0.frame, false)
- })
+ overlayController.screenUnderMouse()
}
/// Clean up settingsWindow reference when the Settings window closes.
@@ -1352,7 +1406,10 @@
let preferredScreen = self.overlayWindow?.screen
self.detachSettingsWindow(closingWindow)
self.settingsWindow = nil
- self.refreshLauncherChromeState(activate: shouldRefocusOverlay)
+ self.refreshLauncherChromeState(
+ activate: shouldRefocusOverlay && !self.overlayAvoidsSpaceSwitch,
+ avoidSpaceSwitch: self.overlayAvoidsSpaceSwitch
+ )
guard shouldRefocusOverlay else { return }
DispatchQueue.main.asyncAfter(deadline: .now() + 0.12) { [weak self] in
self?.showOrFocusOverlay(preferredScreen: preferredScreen)
@@ -1388,6 +1445,21 @@
}
private func promoteOverlayToForegroundInput() {
+ if overlayAvoidsSpaceSwitch {
+ refreshLauncherChromeState(activate: false, avoidSpaceSwitch: true)
+ guard let overlayWindow else { return }
+ overlayWindow.makeKeyAndOrderFront(nil)
+ 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)
@@ -1401,7 +1473,26 @@
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
+ 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()
}
@@ -1410,6 +1501,11 @@
self.installQuickSearchExternalMouseMonitor()
} else {
self.removeQuickSearchExternalMouseMonitor()
+ if hideOverlayOnClose || wasQuickSearchOnlyOverlay {
+ self.quickSearchShouldHideOverlayOnClose = false
+ self.quickSearchOnlyOverlaySession = false
+ self.hideOverlay(force: true, discardWindow: wasQuickSearchOnlyOverlay)
+ }
}
}
@@ -1431,18 +1527,45 @@
}
private func installQuickSearchExternalMouseMonitor() {
+ installQuickSearchLocalMouseMonitor()
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)
+ NotificationCenter.default.post(
+ name: .tagLauncherQuickSearchDismissRequested,
+ object: nil,
+ userInfo: ["source": QuickSearchDismissSource.mouse]
+ )
}
}
}
+ private func installQuickSearchLocalMouseMonitor() {
+ guard quickSearchLocalMouseMonitor == nil else { return }
+ quickSearchLocalMouseMonitor = NSEvent.addLocalMonitorForEvents(
+ matching: [.leftMouseDown, .rightMouseDown, .otherMouseDown]
+ ) { [weak self] event in
+ guard let self, self.isQuickSearchOpen else { return event }
+ if event.window === self.overlayWindow {
+ NotificationCenter.default.post(
+ name: .tagLauncherQuickSearchDismissRequested,
+ object: nil,
+ userInfo: ["source": QuickSearchDismissSource.mouse]
+ )
+ return nil
+ }
+ return event
+ }
+ }
+
private func removeQuickSearchExternalMouseMonitor() {
+ if let quickSearchLocalMouseMonitor {
+ NSEvent.removeMonitor(quickSearchLocalMouseMonitor)
+ self.quickSearchLocalMouseMonitor = nil
+ }
if let quickSearchExternalMouseMonitor {
NSEvent.removeMonitor(quickSearchExternalMouseMonitor)
self.quickSearchExternalMouseMonitor = nil
@@ -1478,14 +1601,22 @@
}
@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()
}
@objc private func openPreferences(_ sender: Any? = nil) {
+ dismissQuickSearchIfNeeded()
TagDatabase.flushPendingCategorySchemeBackupBatch()
- beginLauncherForegroundOwnership()
+ if overlayAvoidsSpaceSwitch {
+ refreshLauncherChromeState(activate: false, avoidSpaceSwitch: true)
+ } else {
+ beginLauncherForegroundOwnership()
+ }
// Don't hide overlay — keep it visible for real-time setting preview.
if let overlayWindow, overlayWindow.isVisible {
overlayWindow.makeKeyAndOrderFront(nil)
@@ -1497,7 +1628,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],
@@ -1509,6 +1640,20 @@
window.isReleasedWhenClosed = false
settingsWindow = window
prepareSettingsWindow(window)
+ }
+
+ private func dismissQuickSearchIfNeeded() {
+ guard isQuickSearchOpen else { return }
+ isQuickSearchOpen = false
+ removeQuickSearchExternalMouseMonitor()
+ updateOverlayLevelForTextInput()
+ quickSearchShouldHideOverlayOnClose = false
+ quickSearchOnlyOverlaySession = false
+ NotificationCenter.default.post(
+ name: .tagLauncherQuickSearchDismissRequested,
+ object: nil,
+ userInfo: ["source": QuickSearchDismissSource.programmatic]
+ )
}
@objc private func switchLanguage(_ sender: NSMenuItem) {
@@ -1570,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