Ariver
2026-05-30 58e665345efb72509d4a375abb61cc4f7802cd1e
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) { }
@@ -335,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)
        }
@@ -349,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,
@@ -894,18 +900,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 +909,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 +1076,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 +1089,6 @@
        }
        lastQuickSearchHotkeyAt = now
        if overlayWindow?.isVisible == true, isQuickSearchOpen || quickSearchOnlyOverlaySession {
            promoteOverlayToForegroundInput()
            updateOverlayLevelForTextInput()
            return
        }
        if overlayWindow?.isVisible == true {
            refreshLauncherChromeState(
                activate: !overlayAvoidsSpaceSwitch,
@@ -1159,7 +1170,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 +1349,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)
@@ -1482,7 +1501,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],