From ffa76a42b2ffddb9271065af794281a170a4bd6f Mon Sep 17 00:00:00 2001
From: Ariver <shanghai3168@gmail.com>
Date: Sat, 23 May 2026 23:42:00 +0800
Subject: [PATCH] Fix fullscreen Space overlay presentation
---
Apptag/ApptagApp.swift | 615 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 497 insertions(+), 118 deletions(-)
diff --git a/Apptag/ApptagApp.swift b/Apptag/ApptagApp.swift
index c030bc6..075c7fc 100644
--- a/Apptag/ApptagApp.swift
+++ b/Apptag/ApptagApp.swift
@@ -6,7 +6,12 @@
@main
struct TagLauncherApp: App {
+ private static let singletonLockFile = TagLauncherProcessSingleton.acquireOrHandOffAndExit()
@NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
+
+ init() {
+ _ = Self.singletonLockFile
+ }
var body: some Scene {
Settings {
@@ -16,6 +21,7 @@
.commands {
CommandGroup(replacing: .systemServices) { }
CommandGroup(replacing: .appVisibility) { }
+ CommandGroup(replacing: .help) { }
}
}
}
@@ -25,16 +31,23 @@
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 {
+final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
private static let showDockIconKey = "showDockIcon"
private static let statusItemAutosaveName = AppIdentity.statusItemAutosaveName
private static let statusItemButtonIdentifier = NSUserInterfaceItemIdentifier("TagLauncherStatusItemButton")
private static let statusItemAccessibilityLabel = AppIdentity.displayName
private static let showAppListMenuItemIdentifier = NSUserInterfaceItemIdentifier("TagLauncherShowAppListMenuItem")
- private static let overlayDefaultLevel = NSWindow.Level.normal
- private static let overlayTextInputLevel = NSWindow.Level.normal
+ private static let externalActivationNotification = Notification.Name("TagLauncherExternalActivationRequested")
+ private static let externalActivationObject = AppIdentity.bundleIdentifier
+ 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?
@@ -50,6 +63,14 @@
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 struct OverlayPlacementContext {
+ let screen: NSScreen
+ let frame: NSRect
+ }
private var isOverlayVisible: Bool {
overlayWindow?.isVisible == true
@@ -61,6 +82,10 @@
private var requiresForegroundOwnership: Bool {
isOverlayVisible || isSettingsVisible
+ }
+
+ private var shouldStageOverlayAsAccessory: Bool {
+ !isSettingsVisible && !UserDefaults.standard.bool(forKey: Self.showDockIconKey)
}
private var currentOverlayLevel: NSWindow.Level {
@@ -99,16 +124,23 @@
observeAppNoteEditing()
observeQuickSearch()
observePreferencesRequests()
+ observeExternalActivationRequests()
observeApplicationMenuChanges()
observeChromeSettings()
observeLanguageChanges()
setupLaunchAtLogin()
- configureApplicationMenuWhenAvailable()
+ suppressReopenUntil = Date().addingTimeInterval(1.0)
+ configureApplicationMenuWhenAvailable(retries: 200)
+ }
+
+ func applicationDidBecomeActive(_ notification: Notification) {
+ configureApplicationMenuWhenAvailable(retries: 12)
}
/// Dock icon click → show overlay (same as menubar "Show TagLauncher")
func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
- showOverlay()
+ guard Date() >= suppressReopenUntil else { return false }
+ showOrFocusOverlay()
return false // Suppress default "unhide all windows" behavior
}
@@ -119,6 +151,11 @@
TagDatabase.flushPendingCategorySchemeBackupBatch()
removeOverlayKeyMonitor()
removeQuickSearchExternalMouseMonitor()
+ DistributedNotificationCenter.default().removeObserver(
+ self,
+ name: Self.externalActivationNotification,
+ object: Self.externalActivationObject
+ )
}
/// Ensure defaultGroupName is always the language-neutral key "Other".
@@ -163,23 +200,76 @@
}
}
- private func beginLauncherForegroundOwnership(activate: Bool = true) {
+ private func beginLauncherForegroundOwnership(activate: Bool = true, keyWindow: NSWindow? = nil) {
if NSApp.activationPolicy() != .regular {
NSApp.setActivationPolicy(.regular)
}
if activate {
- NSApp.activate(ignoringOtherApps: true)
- configureApplicationMenuWhenAvailable(retries: 4)
+ claimLauncherForeground(keyWindow: keyWindow)
}
}
- private func refreshLauncherChromeState(activate: Bool = false) {
+ private func claimLauncherForeground(
+ keyWindow: NSWindow? = nil,
+ retries: Int = 0,
+ overlayGeneration expectedOverlayGeneration: Int? = nil
+ ) {
+ if NSApp.activationPolicy() != .regular {
+ NSApp.setActivationPolicy(.regular)
+ }
+
+ if isOverlayVisible && !NSApp.presentationOptions.contains(.hideDock) {
+ NSApp.presentationOptions = [.hideDock]
+ }
+
+ NSApp.unhide(nil)
+ NSApp.activate(ignoringOtherApps: true)
+
+ if let keyWindow, keyWindow.isVisible {
+ keyWindow.makeKeyAndOrderFront(nil)
+ keyWindow.makeMain()
+ keyWindow.orderFrontRegardless()
+ }
+ configureApplicationMenuWhenAvailable(retries: 4)
+
+ let overlayShouldYieldToSettings = keyWindow == overlayWindow && isSettingsVisible
+ let keyWindowStillNeedsFocus = !overlayShouldYieldToSettings
+ && keyWindow?.isVisible == true
+ && keyWindow?.isKeyWindow == false
+ let shouldRetry = !NSApp.isActive
+ || !NSApp.presentationOptions.contains(.hideDock)
+ || keyWindowStillNeedsFocus
+ guard retries > 0, isOverlayVisible else { return }
+ guard shouldRetry else { return }
+
+ let retryWindow = keyWindow
+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.08) { [weak self] in
+ guard let self, self.isOverlayVisible else { return }
+ if let expectedOverlayGeneration,
+ expectedOverlayGeneration != self.overlayGeneration {
+ return
+ }
+ self.refreshLauncherChromeState()
+ self.claimLauncherForeground(
+ keyWindow: retryWindow,
+ retries: retries - 1,
+ overlayGeneration: expectedOverlayGeneration
+ )
+ }
+ }
+
+ private func refreshLauncherChromeState(activate: Bool = false, avoidSpaceSwitch: Bool = false) {
let showDock = UserDefaults.standard.bool(forKey: Self.showDockIconKey)
lastShowDockIcon = showDock
- let desiredPolicy: NSApplication.ActivationPolicy = requiresForegroundOwnership
+ let shouldStayAccessoryForCurrentFullscreenSpace = avoidSpaceSwitch
+ && isOverlayVisible
+ && !isSettingsVisible
+ let desiredPolicy: NSApplication.ActivationPolicy = shouldStayAccessoryForCurrentFullscreenSpace
+ ? .accessory
+ : (requiresForegroundOwnership
? .regular
- : (showDock ? .regular : .accessory)
+ : (showDock ? .regular : .accessory))
if NSApp.activationPolicy() != desiredPolicy {
NSApp.setActivationPolicy(desiredPolicy)
}
@@ -189,24 +279,28 @@
NSApp.presentationOptions = desiredPresentation
}
- if activate && requiresForegroundOwnership {
- NSApp.activate(ignoringOtherApps: true)
- configureApplicationMenuWhenAvailable(retries: 4)
+ if activate && requiresForegroundOwnership && !shouldStayAccessoryForCurrentFullscreenSpace {
+ let keyWindow = isSettingsVisible ? settingsWindow : (isOverlayVisible ? overlayWindow : nil)
+ claimLauncherForeground(
+ keyWindow: keyWindow,
+ retries: isOverlayVisible && !isSettingsVisible ? 5 : 0,
+ overlayGeneration: isOverlayVisible ? overlayGeneration : nil
+ )
}
}
private func handleApplicationDidResignActive() {
+ guard !isOverlayVisible else {
+ return
+ }
+
if isQuickSearchOpen {
NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
}
- guard isOverlayVisible else {
+ if !requiresForegroundOwnership {
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.
@@ -236,7 +330,7 @@
guard supportsLaunchAtLogin else { return }
let plist: [String: Any] = [
"Label": Self.launchAgentLabel,
- "ProgramArguments": ["open", Bundle.main.bundlePath, "--hide"],
+ "ProgramArguments": Self.expectedLaunchAgentProgramArguments(),
"RunAtLoad": true,
]
let dir = Self.launchAgentURL.deletingLastPathComponent()
@@ -244,10 +338,16 @@
(plist as NSDictionary).write(to: Self.launchAgentURL, atomically: true)
let uid = getuid()
+ let bootoutTask = Process()
+ bootoutTask.launchPath = "/bin/launchctl"
+ bootoutTask.arguments = ["bootout", "gui/\(uid)/\(Self.launchAgentLabel)"]
+ try? bootoutTask.run()
+ bootoutTask.waitUntilExit()
+
let task = Process()
task.launchPath = "/bin/launchctl"
task.arguments = ["bootstrap", "gui/\(uid)", Self.launchAgentURL.path]
- task.launch()
+ try? task.run()
}
static func disableLaunchAtLogin() {
@@ -256,8 +356,23 @@
let task = Process()
task.launchPath = "/bin/launchctl"
task.arguments = ["bootout", "gui/\(uid)/\(Self.launchAgentLabel)"]
- task.launch()
+ try? task.run()
try? FileManager.default.removeItem(at: Self.launchAgentURL)
+ }
+
+ private static func launchAgentProgramArguments() -> [String]? {
+ guard let plist = NSDictionary(contentsOf: Self.launchAgentURL) as? [String: Any] else {
+ return nil
+ }
+ return plist["ProgramArguments"] as? [String]
+ }
+
+ private static func expectedLaunchAgentProgramArguments() -> [String] {
+ let executablePath = Bundle.main.executablePath
+ ?? Bundle.main.bundleURL
+ .appendingPathComponent("Contents/MacOS/\(AppIdentity.displayName)")
+ .path
+ return [executablePath, "--hide"]
}
/// On first launch, enable login item by default via LaunchAgent.
@@ -270,7 +385,14 @@
return
}
let key = "launchAtLogin"
- if !AppDefaults.hasStoredValue(for: key) && UserDefaults.standard.bool(forKey: key) {
+ guard UserDefaults.standard.bool(forKey: key) else {
+ Self.disableLaunchAtLogin()
+ return
+ }
+
+ let expectedArguments = Self.expectedLaunchAgentProgramArguments()
+ if !AppDefaults.hasStoredValue(for: key)
+ || Self.launchAgentProgramArguments() != expectedArguments {
Self.enableLaunchAtLogin()
}
}
@@ -295,14 +417,15 @@
button.imageScaling = .scaleProportionallyDown
button.imagePosition = .imageOnly
button.toolTip = "TagLauncher — Tag-based app launcher"
- button.action = #selector(toggleOverlay)
+ button.action = #selector(toggleOverlay(_:))
button.target = self
}
let menu = NSMenu()
+ menu.delegate = self
let showItem = NSMenuItem(
title: showAppListMenuTitle,
- action: #selector(toggleOverlay),
+ action: #selector(toggleOverlayFromStatusMenu(_:)),
keyEquivalent: ""
)
showItem.target = self
@@ -323,7 +446,7 @@
menu.addItem(.separator())
let prefsItem = NSMenuItem(
title: tr("menu.preferences"),
- action: #selector(openPreferences),
+ action: #selector(openPreferences(_:)),
keyEquivalent: ","
)
prefsItem.target = self
@@ -353,6 +476,19 @@
)
)
statusItem.menu = menu
+ }
+
+ func menuWillOpen(_ menu: NSMenu) {
+ statusMenuScreenForNextOverlay = screenContainingCurrentPointer()
+ ?? statusItem?.button?.window?.screen
+ ?? NSScreen.main
+ ?? NSScreen.screens.first
+ }
+
+ func menuDidClose(_ menu: NSMenu) {
+ DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) { [weak self] in
+ self?.statusMenuScreenForNextOverlay = nil
+ }
}
private func makeMenuBarIcon() -> NSImage {
@@ -454,6 +590,7 @@
}
self.configureApplicationMenu()
+ self.removeHelpMenu()
if retries > 0 && self.applicationMenuNeedsCleanup() {
self.configureApplicationMenuWhenAvailable(retries: retries - 1)
}
@@ -518,7 +655,7 @@
private func configureShowAppListItem(_ item: NSMenuItem) {
item.title = showAppListMenuTitle
- item.action = #selector(toggleOverlay)
+ item.action = #selector(toggleOverlayFromStatusMenu(_:))
item.target = self
item.keyEquivalent = ""
item.keyEquivalentModifierMask = []
@@ -539,7 +676,7 @@
}
item.title = tr("menu.preferences")
- item.action = #selector(openPreferences)
+ item.action = #selector(openPreferences(_:))
item.target = self
item.keyEquivalent = ","
item.keyEquivalentModifierMask = .command
@@ -548,7 +685,7 @@
private func isSettingsMenuItem(_ item: NSMenuItem) -> Bool {
item.action == Selector(("showSettingsWindow:"))
- || item.action == #selector(openPreferences)
+ || item.action == #selector(openPreferences(_:))
|| item.title == tr("menu.preferences")
}
@@ -572,6 +709,22 @@
}
}
+ private func removeHelpMenu() {
+ guard let mainMenu = NSApp.mainMenu else { return }
+ NSApp.helpMenu = nil
+
+ for item in mainMenu.items.reversed() {
+ let isHelpMenu = item.submenu === NSApp.helpMenu
+ || item.title.localizedCaseInsensitiveContains("help")
+ || item.title == tr("menu.help")
+ || item.submenu?.title.localizedCaseInsensitiveContains("help") == true
+ || item.submenu?.title == tr("menu.help")
+ if isHelpMenu {
+ mainMenu.removeItem(item)
+ }
+ }
+ }
+
private func removeMenuBarItem() {
guard let statusItem else { return }
NSStatusBar.system.removeStatusItem(statusItem)
@@ -580,80 +733,177 @@
// MARK: - Overlay Window
- @objc private func toggleOverlay() {
- if overlayWindow?.isVisible == true {
- hideOverlay(force: true)
- } else {
- showOverlay()
+ @objc func toggleOverlay(_ sender: Any) {
+ performToggleOverlay(preferredScreen: nil)
+ }
+
+ @objc func toggleOverlayFromStatusMenu(_ sender: Any) {
+ let preferredScreen = statusMenuScreenForNextOverlay
+ statusMenuScreenForNextOverlay = nil
+ DispatchQueue.main.async { [weak self] in
+ self?.performToggleOverlay(preferredScreen: preferredScreen)
}
}
- private func showOverlay(initialQuickSearchSource: String? = nil) {
- // Use the screen under the mouse cursor — works in fullscreen spaces
- let mousePoint = NSEvent.mouseLocation
- guard let screen = NSScreen.screens.first(where: {
- NSMouseInRect(mousePoint, $0.frame, false)
- }) ?? NSScreen.main ?? NSScreen.screens.first else { return }
-
- let window: NSWindow
- let createdWindow: Bool
- if let existingWindow = overlayWindow {
- window = existingWindow
- createdWindow = false
+ private func performToggleOverlay(preferredScreen: NSScreen?) {
+ if overlayWindow?.isVisible == true {
+ hideOverlay(force: true)
} else {
- window = makeOverlayWindow(on: screen, initialQuickSearchSource: initialQuickSearchSource)
- overlayWindow = window
- createdWindow = true
+ showOverlay(preferredScreen: preferredScreen)
}
+ }
- installOverlayKeyMonitor()
- beginLauncherForegroundOwnership()
-
- 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)
+ 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)
}
- refreshLauncherChromeState(activate: true)
- if let initialQuickSearchSource {
- NotificationCenter.default.post(
- name: .tagLauncherQuickSearchRequested,
- object: nil,
- userInfo: ["source": initialQuickSearchSource]
+ 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)
+ }
+
+ private func showOverlay(
+ initialQuickSearchSource: String? = nil,
+ 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
}
- window.setFrame(targetFrame, display: true)
- window.level = targetLevel
-
- if let initialQuickSearchSource, !createdWindow {
- NotificationCenter.default.post(
- name: .tagLauncherQuickSearchRequested,
- object: nil,
- userInfo: ["source": initialQuickSearchSource]
- )
+ 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
+ )
+ 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()
- refreshLauncherChromeState(activate: true)
- NotificationCenter.default.post(name: .tagLauncherOverlayDidShow, object: nil)
+
+ 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
}
@@ -661,15 +911,34 @@
return nil
}
if self.shouldOpenQuickSearch(for: event) {
- NotificationCenter.default.post(
- name: .tagLauncherQuickSearchRequested,
- object: nil,
- userInfo: ["source": QuickSearchOpenSource.mainOverlay]
- )
+ self.requestQuickSearch(source: QuickSearchOpenSource.mainOverlay)
return nil
}
return event
}
+ }
+
+ private func requestQuickSearch(source: String) {
+ isQuickSearchOpen = true
+ promoteOverlayToForegroundInput()
+ updateOverlayLevelForTextInput()
+ installQuickSearchExternalMouseMonitor()
+ DispatchQueue.main.async {
+ NotificationCenter.default.post(
+ name: .tagLauncherQuickSearchRequested,
+ object: nil,
+ userInfo: ["source": source]
+ )
+ }
+ }
+
+ private func shouldHandleOverlayKeyEvent(_ event: NSEvent) -> Bool {
+ guard overlayWindow?.isVisible == true else { return false }
+ if !isSettingsVisible && NSApp.isActive {
+ return true
+ }
+ if event.window == overlayWindow { return true }
+ return event.window == nil && NSApp.keyWindow == overlayWindow
}
private func shouldOpenQuickSearch(for event: NSEvent) -> Bool {
@@ -683,26 +952,7 @@
!isModalInteractionActive
else { return false }
- guard let firstResponder = overlayWindow?.firstResponder else { return true }
- if firstResponder is NSText || firstResponder is NSTextField {
- return false
- }
- if let responderView = firstResponder as? NSView,
- viewOrAncestorHandlesSpace(responderView) {
- return false
- }
return true
- }
-
- private func viewOrAncestorHandlesSpace(_ view: NSView) -> Bool {
- var current: NSView? = view
- while let candidate = current {
- if candidate is NSButton || candidate is NSSegmentedControl || candidate is NSSlider {
- return true
- }
- current = candidate.superview
- }
- return false
}
private func removeOverlayKeyMonitor() {
@@ -715,21 +965,23 @@
private func makeOverlayWindow(on screen: NSScreen, initialQuickSearchSource: String? = nil) -> NSWindow {
let panel = OverlayPanel(
contentRect: screen.frame,
- styleMask: [.borderless, .fullSizeContentView],
+ 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 = [
- .moveToActiveSpace,
+ .canJoinAllSpaces,
.fullScreenAuxiliary,
.stationary,
.transient,
.ignoresCycle
]
panel.isOpaque = false
- panel.backgroundColor = .clear
+ panel.backgroundColor = NSColor.black.withAlphaComponent(0.001)
panel.hasShadow = false
panel.titlebarAppearsTransparent = true
panel.titleVisibility = .hidden
@@ -750,6 +1002,7 @@
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)
@@ -856,12 +1109,16 @@
if id == LauncherHotkeyKind.quickSearch.eventID {
showQuickSearchFromGlobalHotkey()
} else {
- toggleOverlay()
+ performToggleOverlay(preferredScreen: nil)
}
}
private func showQuickSearchFromGlobalHotkey() {
- guard overlayWindow?.isVisible != true else { return }
+ if overlayWindow?.isVisible == true {
+ refreshLauncherChromeState(activate: true)
+ requestQuickSearch(source: QuickSearchOpenSource.globalVisible)
+ return
+ }
showOverlay(initialQuickSearchSource: QuickSearchOpenSource.globalHidden)
}
@@ -901,6 +1158,15 @@
keyWindow != self.overlayWindow,
!self.isInEditMode
else { return }
+
+ if self.isSettingsOwnedPanel(keyWindow) {
+ return
+ }
+
+ if self.isAppOwnedDocumentWindow(keyWindow) {
+ self.prepareSettingsWindow(keyWindow)
+ return
+ }
// Settings/Preferences window -> float it above overlay for real-time preview.
if self.isSettingsWindowCandidate(keyWindow) {
@@ -959,12 +1225,48 @@
private func isSettingsWindowCandidate(_ window: NSWindow) -> Bool {
if window == settingsWindow { return true }
if window.identifier?.rawValue == "TagLauncherPreferencesWindow" { return true }
+ if isAppOwnedDocumentWindow(window) { return true }
guard NSApp.windows.contains(window),
window != overlayWindow,
window.isVisible,
!(window is NSPanel)
else { return false }
- return true
+ return settingsWindowTitleCandidates().contains(normalizedWindowTitle(window.title))
+ }
+
+ private func isAppOwnedDocumentWindow(_ window: NSWindow) -> Bool {
+ NSApp.windows.contains(window)
+ && window != overlayWindow
+ && window.isVisible
+ && !(window is NSPanel)
+ }
+
+ private func settingsWindowTitleCandidates() -> Set<String> {
+ let keys = [
+ "menu.preferences",
+ "settings.language",
+ "settings.general",
+ "quickSearch.hotkeys",
+ "settings.tags",
+ "settings.data",
+ "settings.about"
+ ]
+ return Set(keys.map { normalizedWindowTitle(tr($0)) })
+ }
+
+ private func normalizedWindowTitle(_ title: String) -> String {
+ title
+ .replacingOccurrences(of: "…", with: "")
+ .trimmingCharacters(in: .whitespacesAndNewlines)
+ }
+
+ private func isSettingsOwnedPanel(_ window: NSWindow) -> Bool {
+ guard window is NSPanel else { return false }
+ if window is NSSavePanel { return true }
+ guard let settingsWindow else { return false }
+ return window.sheetParent == settingsWindow
+ || settingsWindow.attachedSheet == window
+ || window.parent == settingsWindow
}
private func center(_ window: NSWindow, over rect: NSRect) {
@@ -977,10 +1279,24 @@
}
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)
- }) ?? NSScreen.main ?? NSScreen.screens.first
+ })
}
/// Clean up settingsWindow reference when the Settings window closes.
@@ -994,9 +1310,15 @@
let closingWindow = notification.object as? NSWindow,
closingWindow == self.settingsWindow
else { return }
+ let shouldRefocusOverlay = self.isOverlayVisible
+ let preferredScreen = self.overlayWindow?.screen
self.detachSettingsWindow(closingWindow)
self.settingsWindow = nil
- self.refreshLauncherChromeState()
+ self.refreshLauncherChromeState(activate: shouldRefocusOverlay)
+ guard shouldRefocusOverlay else { return }
+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.12) { [weak self] in
+ self?.showOrFocusOverlay(preferredScreen: preferredScreen)
+ }
}
}
@@ -1011,7 +1333,7 @@
}
}
- /// Lower the overlay while text input is active so IME and cursor services are not hidden behind it.
+ /// Keep text-input overlays at the launcher level so Quick Search stays visible in fullscreen Spaces.
private func observeAppNoteEditing() {
NotificationCenter.default.addObserver(
forName: .tagLauncherAppNoteEditingChanged,
@@ -1020,8 +1342,18 @@
) { [weak self] notification in
guard let self else { return }
self.isEditingAppNote = (notification.userInfo?["active"] as? Bool) ?? false
+ if self.isEditingAppNote {
+ self.promoteOverlayToForegroundInput()
+ }
self.updateOverlayLevelForTextInput()
}
+ }
+
+ private func promoteOverlayToForegroundInput() {
+ beginLauncherForegroundOwnership()
+ guard let overlayWindow else { return }
+ overlayWindow.makeKeyAndOrderFront(nil)
+ overlayWindow.orderFrontRegardless()
}
private func observeQuickSearch() {
@@ -1032,6 +1364,9 @@
) { [weak self] notification in
guard let self else { return }
self.isQuickSearchOpen = (notification.userInfo?["active"] as? Bool) ?? false
+ if self.isQuickSearchOpen {
+ self.promoteOverlayToForegroundInput()
+ }
self.updateOverlayLevelForTextInput()
if self.isQuickSearchOpen {
self.installQuickSearchExternalMouseMonitor()
@@ -1095,7 +1430,22 @@
}
}
- @objc private func openPreferences() {
+ private func observeExternalActivationRequests() {
+ DistributedNotificationCenter.default().addObserver(
+ self,
+ selector: #selector(handleExternalActivationRequest(_:)),
+ name: Self.externalActivationNotification,
+ object: Self.externalActivationObject
+ )
+ }
+
+ @objc private func handleExternalActivationRequest(_ notification: Notification) {
+ let shouldShowOverlay = notification.userInfo?["showOverlay"] as? Bool ?? true
+ guard shouldShowOverlay else { return }
+ showOrFocusOverlay()
+ }
+
+ @objc private func openPreferences(_ sender: Any? = nil) {
TagDatabase.flushPendingCategorySchemeBackupBatch()
beginLauncherForegroundOwnership()
// Don't hide overlay — keep it visible for real-time setting preview.
@@ -1133,29 +1483,46 @@
final class DismissibleHostingView<Content: View>: NSHostingView<Content> {
private let onBackdropTap: () -> Void
- private var suppressBackdropDismiss = false
+ private var modalInteractionSuppressesBackdropDismiss = false
+ private var quickSearchSuppressesBackdropDismiss = false
private var modalInteractionObserver: NSObjectProtocol?
+ private var quickSearchVisibilityObserver: NSObjectProtocol?
+
+ private var suppressBackdropDismiss: Bool {
+ modalInteractionSuppressesBackdropDismiss || quickSearchSuppressesBackdropDismiss
+ }
@MainActor required init(rootView: Content) {
self.onBackdropTap = {}
super.init(rootView: rootView)
- observeModalInteractionChanges()
+ installWindowServerAnchorLayer()
+ observeBackdropDismissSuppressionChanges()
}
init(rootView: Content, onBackdropTap: @escaping () -> Void) {
self.onBackdropTap = onBackdropTap
super.init(rootView: rootView)
- observeModalInteractionChanges()
+ installWindowServerAnchorLayer()
+ observeBackdropDismissSuppressionChanges()
}
deinit {
if let modalInteractionObserver {
NotificationCenter.default.removeObserver(modalInteractionObserver)
}
+ if let quickSearchVisibilityObserver {
+ NotificationCenter.default.removeObserver(quickSearchVisibilityObserver)
+ }
}
@available(*, unavailable)
required init?(coder: NSCoder) { fatalError() }
+
+ private func installWindowServerAnchorLayer() {
+ wantsLayer = true
+ // A near-transparent backing pixel makes the WindowServer publish the panel immediately.
+ layer?.backgroundColor = NSColor.black.withAlphaComponent(0.001).cgColor
+ }
override func mouseDown(with event: NSEvent) {
let location = convert(event.locationInWindow, from: nil)
@@ -1164,6 +1531,10 @@
return
}
if hit == self {
+ if quickSearchSuppressesBackdropDismiss {
+ NotificationCenter.default.post(name: .tagLauncherQuickSearchDismissRequested, object: nil)
+ return
+ }
if suppressBackdropDismiss {
super.mouseDown(with: event)
return
@@ -1190,13 +1561,21 @@
super.mouseDown(with: event)
}
- private func observeModalInteractionChanges() {
+ private func observeBackdropDismissSuppressionChanges() {
modalInteractionObserver = NotificationCenter.default.addObserver(
forName: .tagLauncherModalInteractionChanged,
object: nil,
queue: .main
) { [weak self] notification in
- self?.suppressBackdropDismiss = (notification.userInfo?["active"] as? Bool) ?? false
+ self?.modalInteractionSuppressesBackdropDismiss = (notification.userInfo?["active"] as? Bool) ?? false
+ }
+
+ quickSearchVisibilityObserver = NotificationCenter.default.addObserver(
+ forName: .tagLauncherQuickSearchVisibilityChanged,
+ object: nil,
+ queue: .main
+ ) { [weak self] notification in
+ self?.quickSearchSuppressesBackdropDismiss = (notification.userInfo?["active"] as? Bool) ?? false
}
}
--
Gitblit v1.9.3