Fix overlay visibility in fullscreen spaces

Ariver

2026-05-10 6ec832e63368345e1d2ba99e68dfad8ce2a4fc29

Fix overlay visibility in fullscreen spaces

 Apptag/ApptagApp.swift

@@ -1,7 +1,6 @@
import SwiftUI
import AppKit
import Carbon
import ServiceManagement

// MARK: - Application Entry Point

@@ -13,27 +12,61 @@
        Settings {
            PreferencesView()
        }
        .defaultSize(width: 660, height: 380)
    }
}

// MARK: - App Delegate (menubar + overlay window + hotkey)

final class OverlayPanel: NSPanel {
    override var canBecomeKey: Bool { true }
    override var canBecomeMain: Bool { true }
}

final class AppDelegate: NSObject, NSApplicationDelegate {
    private var statusItem: NSStatusItem!
    private var overlayWindow: NSWindow?
    private var settingsWindow: NSWindow?    // Track Settings window to keep it above overlay
    private var hotkeyRef: EventHotKeyRef?
    private var isInEditMode = false  // Suppress auto-dismiss during editing

    func applicationDidFinishLaunching(_ notification: Notification) {
        L10n.setup()
        migrateDefaultGroupName()
        TagDatabase.seedDefaultTags()
        let showDock = UserDefaults.standard.bool(forKey: "showDockIcon")
        NSApp.setActivationPolicy(showDock ? .regular : .accessory)
        setupMenuBar()
        registerHotkey()
        observeOtherWindows()
        observeSettingsClose()
        observeEditMode()
        observeDockSetting()
        setupLaunchAtLogin()
    }

    /// Dock icon click → show overlay (same as menubar "Show Apptag")
    func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
        showOverlay()
        return false  // Suppress default "unhide all windows" behavior
    }

    /// Ensure defaultGroupName is always the language-neutral key "Other".
    /// Translates known old values back to "Other" so switching languages works.
    private func migrateDefaultGroupName() {
        let key = "defaultGroupName"
        let stored = UserDefaults.standard.string(forKey: key)
        // "Other" is the neutral key — nothing to do
        if stored == nil || stored == "Other" { return }
        // Check if the stored value is a translated version of "group.uncategorized"
        for (code, _) in L10n.supported {
            let loc = L10n.loadedTranslation("group.uncategorized", for: code)
            if stored == loc {
                UserDefaults.standard.set("Other", forKey: key)
                return
            }
        }
        // User has set a custom name — keep it
    }

    /// Observe Show in Dock changes so it takes effect immediately.
@@ -47,15 +80,48 @@
        }
    }

    /// Enable launch at login by default; prompt user if disabled.
    // MARK: - Launch at Login (LaunchAgent, zero permissions)

    private static let launchAgentLabel = "com.apptag.launcher"

    private static var launchAgentURL: URL {
        FileManager.default.homeDirectoryForCurrentUser
            .appendingPathComponent("Library/LaunchAgents/\(launchAgentLabel).plist")
    }

    static func enableLaunchAtLogin() {
        let plist: [String: Any] = [
            "Label": Self.launchAgentLabel,
            "ProgramArguments": ["open", Bundle.main.bundlePath, "--hide"],
            "RunAtLoad": true,
        ]
        let dir = Self.launchAgentURL.deletingLastPathComponent()
        try? FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
        (plist as NSDictionary).write(to: Self.launchAgentURL, atomically: true)

        let uid = getuid()
        let task = Process()
        task.launchPath = "/bin/launchctl"
        task.arguments = ["bootstrap", "gui/\(uid)", Self.launchAgentURL.path]
        task.launch()
    }

    static func disableLaunchAtLogin() {
        let uid = getuid()
        let task = Process()
        task.launchPath = "/bin/launchctl"
        task.arguments = ["bootout", "gui/\(uid)/\(Self.launchAgentLabel)"]
        task.launch()
        try? FileManager.default.removeItem(at: Self.launchAgentURL)
    }

    /// On first launch, enable login item by default via LaunchAgent.
    /// Does NOT require App Management permission.
    private func setupLaunchAtLogin() {
        let key = "launchAtLogin"
        if UserDefaults.standard.object(forKey: key) == nil {
            // First launch: enable by default
            UserDefaults.standard.set(true, forKey: key)
            try? SMAppService.mainApp.register()
        } else if UserDefaults.standard.bool(forKey: key) {
            try? SMAppService.mainApp.register()
            Self.enableLaunchAtLogin()
        }
    }

@@ -81,7 +147,7 @@
        let menu = NSMenu()
        menu.addItem(
            NSMenuItem(
                title: tr("menu.show"),
                title: "\(tr("menu.show"))  ⇧⌥Space",
                action: #selector(toggleOverlay),
                keyEquivalent: ""
            )
@@ -144,23 +210,27 @@
    }

    private func showOverlay() {
        if overlayWindow == 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 }

            overlayWindow = NSWindow(
        if overlayWindow == nil {
            let panel = OverlayPanel(
                contentRect: screen.frame,
                styleMask: [.borderless, .fullSizeContentView],
                styleMask: [.borderless, .fullSizeContentView, .nonactivatingPanel],
                backing: .buffered,
                defer: false
            )
            overlayWindow?.level = .floating
            panel.isFloatingPanel = true
            panel.hidesOnDeactivate = false
            overlayWindow = panel
            overlayWindow?.collectionBehavior = [
                .canJoinAllSpaces,
                .fullScreenAuxiliary,
                .stationary,
                .transient,
                .ignoresCycle
            ]
            overlayWindow?.isOpaque = false
@@ -179,6 +249,8 @@
                }
            )
        }
        overlayWindow?.setFrame(screen.frame, display: true)
        overlayWindow?.level = .screenSaver

        // Local key monitor: catch Escape while overlay is up
        NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
@@ -190,6 +262,7 @@
        }

        overlayWindow?.makeKeyAndOrderFront(nil)
        overlayWindow?.orderFrontRegardless()
        NSApp.activate(ignoringOtherApps: true)
    }

@@ -200,6 +273,7 @@

    // MARK: - Global Hotkey (Shift+Option+Space)

    /// Carbon RegisterEventHotKey. If it fails (sandbox, etc.), falls back to menu bar only.
    private func registerHotkey() {
        var hotkeyID = EventHotKeyID()
        hotkeyID.signature = OSType(0x41505447) // 'APTG'
@@ -264,7 +338,36 @@
                  keyWindow != self.overlayWindow,
                  !self.isInEditMode
            else { return }

            // Settings/Preferences window → float it above overlay for real-time preview
            if NSApp.windows.contains(keyWindow) {
                if self.overlayWindow?.isVisible == true {
                    keyWindow.level = .popUpMenu
                }
                if self.settingsWindow == nil {
                    keyWindow.minSize = NSSize(width: 660, height: 380)
                    keyWindow.maxSize = NSSize(width: 660, height: CGFloat.greatestFiniteMagnitude)
                }
                self.settingsWindow = keyWindow
                return
            }

            self.hideOverlay()
        }
    }

    /// Clean up settingsWindow reference when the Settings window closes.
    private func observeSettingsClose() {
        NotificationCenter.default.addObserver(
            forName: NSWindow.willCloseNotification,
            object: nil,
            queue: .main
        ) { [weak self] notification in
            guard let self,
                  let closingWindow = notification.object as? NSWindow,
                  closingWindow == self.settingsWindow
            else { return }
            self.settingsWindow = nil
        }
    }

@@ -280,7 +383,8 @@
    }

    @objc private func openPreferences() {
        hideOverlay()
        // Don't hide overlay — keep it visible for real-time setting preview.
        // observeOtherWindows handles raising the Settings window above the overlay.
        NSApp.sendAction(Selector(("showSettingsWindow:")), to: nil, from: nil)
    }

@@ -376,14 +480,13 @@
    @AppStorage("hideAppNames") private var hideAppNames = false
    @AppStorage("showDockIcon") private var showDockIcon = false
    @AppStorage("launchAtLogin") private var launchAtLogin = true

    @State private var allApps: [AppInfo] = []
    @State private var tagColors: [String: Int] = [:]

    private func scanApps() {
        DispatchQueue.global(qos: .userInitiated).async {
            var apps = AppIndexer.scan()
            let store = TagDatabase.migrateFromFinderIfNeeded(apps: apps)
            let store = TagDatabase.load()
            apps = TagEditor.annotate(apps: apps)
            let colors = store.tags.mapValues { $0.color }
            DispatchQueue.main.async {
@@ -395,7 +498,7 @@

    private func exportTags() {
        let panel = NSSavePanel()
        panel.title = "Export Tags"
        panel.title = tr("settings.export")
        panel.nameFieldStringValue = "Apptag-tags.json"
        panel.allowedContentTypes = [.json]
        panel.begin { response in
@@ -410,7 +513,7 @@

    private func importTags() {
        let panel = NSOpenPanel()
        panel.title = "Import Tags"
        panel.title = tr("settings.import")
        panel.allowedContentTypes = [.json]
        panel.allowsMultipleSelection = false
        panel.begin { response in
@@ -422,7 +525,7 @@
                fputs("[Apptag] Import failed: \(error)\n", stderr)
                // Show alert on failure
                let alert = NSAlert()
                alert.messageText = "Import Failed"
                alert.messageText = tr("settings.importFailed")
                alert.informativeText = error.localizedDescription
                alert.alertStyle = .warning
                alert.runModal()
@@ -440,84 +543,96 @@
    var body: some View {
        TabView {
            // Tab 1: General
            Form {
                Section {
            VStack(alignment: .leading, spacing: 0) {
                // Toggle row — centered as a rectangular block
                    HStack(spacing: 20) {
                        Toggle("Launch at login", isOn: $launchAtLogin)
                    Toggle(tr("settings.launchAtLogin"), isOn: $launchAtLogin)
                            .onChange(of: launchAtLogin) { _, enabled in
                                if enabled {
                                    try? SMAppService.mainApp.register()
                                AppDelegate.enableLaunchAtLogin()
                                } else {
                                    try? SMAppService.mainApp.unregister()
                                AppDelegate.disableLaunchAtLogin()
                                }
                            }
                        Toggle("Show in Dock", isOn: $showDockIcon)
                        Toggle("Hide app names", isOn: $hideAppNames)
                    Toggle(tr("settings.showInDock"), isOn: $showDockIcon)
                    Toggle(tr("settings.hideAppNames"), isOn: $hideAppNames)
                    }
                }
                .padding(.bottom, 12)
                .frame(maxWidth: .infinity, alignment: .center)
                .padding(.bottom, 16)

                Section {
                    LabeledContent("App list style:") {
                Divider()
                    .padding(.bottom, 16)

                // Two-column layout: each row label (right-aligned) + controls (left-aligned)
                // All pickers and descriptions share the same left edge
                VStack(spacing: 16) {
                    HStack(alignment: .top, spacing: 16) {
                        Text(tr("settings.appListStyle"))
                            .frame(width: 130, alignment: .trailing)
                        VStack(alignment: .leading, spacing: 4) {
                        Picker("", selection: $displayMode) {
                            Text("Flat").tag("flat")
                            Text("Container").tag("container")
                                Text(tr("settings.flat")).tag("flat")
                                Text(tr("settings.container")).tag("container")
                        }
                        .pickerStyle(.segmented)
                        .frame(width: 210)
                            .frame(width: 280, alignment: .leading)
                            Text(tr("settings.flatDesc"))
                                .font(.caption).foregroundStyle(.secondary)
                                .fixedSize(horizontal: false, vertical: true)
                    }
                    Text("\"Flat\" shows apps directly. \"Container\" wraps each tag group in a rounded box.")
                        .font(.caption)
                        .foregroundStyle(.secondary)
                }

                Section {
                    LabeledContent("Tag position:") {
                    HStack(alignment: .top, spacing: 16) {
                        Text(tr("settings.tagPosition"))
                            .frame(width: 130, alignment: .trailing)
                        VStack(alignment: .leading, spacing: 4) {
                        Picker("", selection: $tagPosition) {
                            Text("Left").tag("left")
                            Text("Right").tag("right")
                            Text("Top").tag("top")
                                Text(tr("settings.left")).tag("left")
                                Text(tr("settings.right")).tag("right")
                                Text(tr("settings.top")).tag("top")
                        }
                        .pickerStyle(.segmented)
                        .frame(width: 210)
                            .frame(width: 280, alignment: .leading)
                            Text(tr("settings.tagPosDesc"))
                                .font(.caption).foregroundStyle(.secondary)
                                .fixedSize(horizontal: false, vertical: true)
                    }
                    Text("Where the tag navigation bar appears. Left/Right puts tags in a sidebar.")
                        .font(.caption)
                        .foregroundStyle(.secondary)
                }

                Section {
                    LabeledContent("Tag font size:") {
                    HStack(alignment: .top, spacing: 16) {
                        Text(tr("settings.tagFontSize"))
                            .frame(width: 130, alignment: .trailing)
                        VStack(alignment: .leading, spacing: 4) {
                        Picker("", selection: $tagFontSize) {
                            ForEach([16.0, 18.0, 20.0, 22.0, 24.0, 26.0], id: \.self) { size in
                                Text("\(Int(size))").tag(size)
                            }
                        }
                        .pickerStyle(.segmented)
                        .frame(width: 280)
                            .frame(width: 280, alignment: .leading)
                            Text(tr("settings.tagFontDesc"))
                                .font(.caption).foregroundStyle(.secondary)
                                .fixedSize(horizontal: false, vertical: true)
                    }
                    Text("Adjust the size of group-name labels in the overlay.")
                        .font(.caption)
                        .foregroundStyle(.secondary)
                }

                Section {
                    LabeledContent("Icon size:") {
                    HStack(alignment: .top, spacing: 16) {
                        Text(tr("settings.iconSize"))
                            .frame(width: 130, alignment: .trailing)
                        VStack(alignment: .leading, spacing: 4) {
                        Picker("", selection: $iconSize) {
                            ForEach([40.0, 48.0, 56.0, 64.0, 72.0, 80.0], id: \.self) { size in
                                Text("\(Int(size))").tag(size)
                            }
                        }
                        .pickerStyle(.segmented)
                        .frame(width: 280)
                    }
                    Text("Icon display size. Grid columns adjust automatically.")
                        .font(.caption)
                        .foregroundStyle(.secondary)
                            .frame(width: 280, alignment: .leading)
                            Text(tr("settings.iconSizeDesc"))
                                .font(.caption).foregroundStyle(.secondary)
                                .fixedSize(horizontal: false, vertical: true)
                }
            }
            .tabItem { Label("General", systemImage: "gearshape") }
                }
            }
            .padding()
            .tabItem { Label(tr("settings.general"), systemImage: "gearshape") }

            // Tab 2: Tags
            VStack(spacing: 0) {
@@ -527,54 +642,66 @@
                    onRefresh: { scanApps() }
                )
            }
            .tabItem { Label("Tags", systemImage: "tag.fill") }
            .padding(.leading, 16)
            .tabItem { Label(tr("settings.tags"), systemImage: "tag.fill") }
            .onAppear { scanApps() }

            // Tab 3: Data
            Form {
                Section {
                    HStack(spacing: 12) {
                        Button("Export Tags…") { exportTags() }
                        Button(tr("settings.export")) { exportTags() }
                            .buttonStyle(.bordered)
                        Button("Import Tags…") { importTags() }
                        Button(tr("settings.import")) { importTags() }
                            .buttonStyle(.bordered)
                    }
                    Text("Export saves your tag assignments to a JSON file. Import replaces the current database with one from a file.")
                    Text(tr("settings.backupDesc"))
                        .font(.caption)
                        .foregroundStyle(.secondary)
                } header: {
                    Text("Backup & Restore")
                    Text(tr("settings.backup"))
                }
            }
            .tabItem { Label("Data", systemImage: "externaldrive.fill") }
            .tabItem { Label(tr("settings.data"), systemImage: "externaldrive.fill") }
            .padding()

            // Tab 3: About
            // Tab 4: About
            Form {
                Section {
                    HStack {
                        if let icon = NSImage(named: NSImage.applicationIconName) {
                            Image(nsImage: icon)
                                .resizable()
                                .frame(width: 64, height: 64)
                                .frame(width: 128, height: 128)
                        }
                        VStack(alignment: .leading, spacing: 4) {
                            Text("Apptag")
                                .font(.title2)
                                .fontWeight(.semibold)
                            Text("Tag-based app launcher")
                            Text(tr("app.description"))
                                .font(.body)
                                .foregroundStyle(.secondary)
                            Text("Version \(appVersion) (Build \(buildVersion))")
                            Text("\(tr("app.version")) \(appVersion) (\(tr("app.build")) \(buildVersion))")
                                .font(.callout)
                                .foregroundStyle(.tertiary)

                            Divider()
                                .padding(.vertical, 4)

                            Text("万物之中，希望最美")
                                .font(.caption)
                                .foregroundStyle(.secondary)
                            Text("永桔@2026-18602102518")
                                .font(.caption)
                                .foregroundStyle(.secondary)
                        }
                    }
                    .padding(.leading, 100)
                }
            }
            .tabItem { Label("About", systemImage: "info.circle") }
            .tabItem { Label(tr("settings.about"), systemImage: "info.circle") }
            .padding()
        }
        .frame(minWidth: 660, idealWidth: 660, minHeight: 380, idealHeight: 380)
        .frame(minWidth: 660, maxWidth: 660, minHeight: 380)
    }
}

 Apptag/Info.plist

@@ -19,7 +19,7 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleShortVersionString</key>
    <string>3.1.5</string>
    <string>3.1.29</string>
    <key>CFBundleVersion</key>
    <string>1</string>
    <key>LSMinimumSystemVersion</key>

 CHANGELOG.md

@@ -1,5 +1,106 @@
# Apptag Changelog

## [3.1.29] — 2026-05-10

- 继续修复全屏 Space 唤出不可见问题：overlay 改为非激活 NSPanel，并加入 stationary/transient 全屏辅助行为，确保在当前全屏 Space 前置显示

## [3.1.28] — 2026-05-10

- 修复全屏 Space 下 Shift+Option+Space 唤出 Apptag 后 overlay 被全屏应用遮挡的问题：显示时刷新当前屏幕 frame，提升窗口层级并强制前置

## [3.1.27] — 2026-05-07

- 彻底移除 SMAppService，改用 LaunchAgent（~/Library/LaunchAgents）控制登录启动，零权限

## [3.1.26] — 2026-05-07

- 修复每次启动重复触发 App 管理权限弹窗：SMAppService.register() 只在首次调用

## [3.1.25] — 2026-05-07

- 首次启动自动 seed 7 个默认标签（设计/编程/写作/游戏/娱乐/系统优化/办公），9 语言适配

## [3.1.24] — 2026-05-07

- 关于页整体右移 100pt，视觉居中

## [3.1.23] — 2026-05-07

- 关于页：图标放大一倍 (128×128)，签名档精简为两行

## [3.1.22] — 2026-05-07

- 关于页签新增签名档

## [3.1.21] — 2026-05-06

- 大幅缩减包体：4.1MB → 900KB（二进制 strip + icon 压缩）

## [3.1.20] — 2026-05-06

- 修复设置页面切换 tab 时宽度跃变：固定宽度 660pt，高度可拖动调整

## [3.1.19] — 2026-05-06

- 修复默认组名不随语言切换的问题：存储语言中立 key "Other"，显示时翻译
- 移除 Sandbox entitlements（不再索要 App 管理权限）
- 移除 Accessibility 热键降级方案，保持纯 Carbon hotkey + 菜单栏 fallback
- 新增 App Store 提审资料文档 (AppStore_Submission.md) + 截图脚本 (screenshots.sh)
- 新增 App Store 1024×1024 图标 (AppStore_1024.png)

## [3.1.16] — 2026-05-06

- 回滚所有快捷键设置功能（v3.1.13~v3.1.15），回到 v3.1.12 稳定状态

## [3.1.15] — 2026-05-06

- 修复 HotkeyHelper 崩溃：kVK 常量非连续编号，改用字典查表替代 switch range

## [3.1.14] — 2026-05-06

- 快捷键设置独立为第 3 个页签（键盘图标），Data 恢复原样

## [3.1.13] — 2026-05-06

- 新增全局快捷键设置（Data 页签）：点击按钮后按下新快捷键即可更改，支持任意组合键
- 菜单栏「Show Apptag」右侧显示当前快捷键
- HotkeyHelper：Carbon keycode → 人类可读字符串（⇧⌥Space, ⌘A, F1 等）

## [3.1.12] — 2026-05-06

- General 标签页：放弃 Grid，回到逐行 HStack；4 个 Picker 统一 280pt 左对齐，描述文字左边缘与 Picker 严格对齐
- "其他" 默认组改名为 "未分类"，9 语种全部翻译；启动时自动迁移旧 "Other" 值

## [3.1.11] — 2026-05-06

- General 标签页：改用 Grid 布局替代固定 frame，标签列按内容宽度自动右对齐
- 点击 Dock 图标现在等同于菜单栏 "Show Apptag"，直接全屏显示 APP 列表

## [3.1.10] — 2026-05-06

- General 标签页：Toggle 行横向居中；标签-控件改为逐行 HStack（替代并行 VStack），消除垂直不对齐
- 修复设置页面行为：打开偏好设置时不再隐藏 overlay，Settings 窗口提升至 overlay 上方供实时预览
- Tags 标签页整体向右偏移 16px

## [3.1.9] — 2026-05-06

- Grid 布局替换独立 HStack：标签列 + 控件列严格对齐，16pt 间距

## [3.1.8] — 2026-05-06

- 优化 General 标签页排版：标签文字右对齐、选项/说明左对齐、间距16pt

## [3.1.7] — 2026-05-06

- 彻底清除 Finder 标签残留：移除 `migrateFromFinderIfNeeded()`, `readFinderTags()`, `Store.migrated`, `removeTag()`
- 移除 AppIcon.iconset 目录（build 已改用 icon-icns.icns）

## [3.1.6] — 2026-05-06

- 完整国际化：Settings 所有页面、编辑模式、标签编辑器全部使用 tr() 翻译
- 9 语种翻译补全（新增 settings.*, edit.*, tag.*, app.* 共 14 个 key）
- 新增 key：settings.launchAtLogin, settings.showInDock, edit.tags, app.name, app.description, app.version, app.build

## [3.1.3] — 2026-05-06

- 清除 Re-index 功能：已脱离 Finder，每次 overlay 打开自动扫描新 app，无需手动触发
@@ -117,4 +218,3 @@
- Carbon 全局热键 Shift+Option+Space
- Finder 标签读取、分组显示、全屏 overlay
- 标签编辑（与 Finder xattr 同步）