checkpoint: v3.1.5 — 第一二行间距加大12px

Ariver

2026-05-06 c992a5929562434a8b0482ec7389cb7f70d20bb7

 Apptag/ApptagApp.swift

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

// MARK: - Application Entry Point

@@ -31,6 +32,31 @@
        registerHotkey()
        observeOtherWindows()
        observeEditMode()
        observeDockSetting()
        setupLaunchAtLogin()
    }

    /// Observe Show in Dock changes so it takes effect immediately.
    private func observeDockSetting() {
        NotificationCenter.default.addObserver(
            forName: UserDefaults.didChangeNotification,
            object: nil, queue: .main
        ) { _ in
            let show = UserDefaults.standard.bool(forKey: "showDockIcon")
            NSApp.setActivationPolicy(show ? .regular : .accessory)
        }
    }

    /// Enable launch at login by default; prompt user if disabled.
    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()
        }
    }

    // MARK: - Menu Bar
@@ -349,6 +375,7 @@
    @AppStorage("displayMode") private var displayMode = "flat"
    @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] = [:]
@@ -415,6 +442,22 @@
            // Tab 1: General
            Form {
                Section {
                    HStack(spacing: 20) {
                        Toggle("Launch at login", isOn: $launchAtLogin)
                            .onChange(of: launchAtLogin) { _, enabled in
                                if enabled {
                                    try? SMAppService.mainApp.register()
                                } else {
                                    try? SMAppService.mainApp.unregister()
                                }
                            }
                        Toggle("Show in Dock", isOn: $showDockIcon)
                        Toggle("Hide app names", isOn: $hideAppNames)
                    }
                }
                .padding(.bottom, 12)

                Section {
                    LabeledContent("App list style:") {
                        Picker("", selection: $displayMode) {
                            Text("Flat").tag("flat")
@@ -472,14 +515,6 @@
                        .font(.caption)
                        .foregroundStyle(.secondary)
                }

                Section {
                    Toggle("Show in Dock", isOn: $showDockIcon)
                }

                Section {
                    Toggle("Hide app names", isOn: $hideAppNames)
                }
            }
            .tabItem { Label("General", systemImage: "gearshape") }
            .padding()
@@ -497,21 +532,6 @@

            // Tab 3: Data
            Form {
                Section {
                    HStack {
                        Button("Re-index Now") {
                            NotificationCenter.default.post(name: .apptagReindex, object: nil)
                        }
                        .buttonStyle(.borderedProminent)

                        Text("Re-scan all app directories and refresh the tag database.")
                            .font(.caption)
                            .foregroundStyle(.secondary)
                    }
                } header: {
                    Text("Index Management")
                }

                Section {
                    HStack(spacing: 12) {
                        Button("Export Tags…") { exportTags() }