From c8a1b811bffd13dc6dfa39a7c5c0d4ee76cd11e5 Mon Sep 17 00:00:00 2001
From: Ariver <ar@MacBook-Air.local>
Date: Mon, 11 May 2026 12:53:34 +0800
Subject: [PATCH] Release TagLauncher 5.5.0
---
Apptag/ApptagApp.swift | 272 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 199 insertions(+), 73 deletions(-)
diff --git a/Apptag/ApptagApp.swift b/Apptag/ApptagApp.swift
index f3f3948..ff4466d 100644
--- a/Apptag/ApptagApp.swift
+++ b/Apptag/ApptagApp.swift
@@ -5,14 +5,14 @@
// MARK: - Application Entry Point
@main
-struct ApptagApp: App {
+struct TagLauncherApp: App {
@NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
var body: some Scene {
Settings {
PreferencesView()
}
- .defaultSize(width: 660, height: 380)
+ .defaultSize(width: 880, height: 420)
}
}
@@ -42,10 +42,11 @@
observeSettingsClose()
observeEditMode()
observeDockSetting()
+ observeLanguageChanges()
setupLaunchAtLogin()
}
- /// Dock icon click → show overlay (same as menubar "Show Apptag")
+ /// Dock icon click → show overlay (same as menubar "Show TagLauncher")
func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
showOverlay()
return false // Suppress default "unhide all windows" behavior
@@ -77,6 +78,16 @@
) { _ in
let show = UserDefaults.standard.bool(forKey: "showDockIcon")
NSApp.setActivationPolicy(show ? .regular : .accessory)
+ }
+ }
+
+ /// Keep app chrome in sync when language changes from any entry point.
+ private func observeLanguageChanges() {
+ NotificationCenter.default.addObserver(
+ forName: .appLanguageDidChange,
+ object: nil, queue: .main
+ ) { [weak self] _ in
+ self?.setupMenuBar()
}
}
@@ -137,9 +148,9 @@
if let button = statusItem.button {
button.image = NSImage(
systemSymbolName: "tag.fill",
- accessibilityDescription: "Apptag"
+ accessibilityDescription: "TagLauncher"
)
- button.toolTip = "Apptag — Tag-based app launcher"
+ button.toolTip = "TagLauncher — Tag-based app launcher"
button.action = #selector(toggleOverlay)
button.target = self
}
@@ -216,41 +227,10 @@
NSMouseInRect(mousePoint, $0.frame, false)
}) ?? NSScreen.main ?? NSScreen.screens.first else { return }
- if overlayWindow == nil {
- let panel = OverlayPanel(
- contentRect: screen.frame,
- styleMask: [.borderless, .fullSizeContentView, .nonactivatingPanel],
- backing: .buffered,
- defer: false
- )
- panel.isFloatingPanel = true
- panel.hidesOnDeactivate = false
- overlayWindow = panel
- overlayWindow?.collectionBehavior = [
- .canJoinAllSpaces,
- .fullScreenAuxiliary,
- .stationary,
- .transient,
- .ignoresCycle
- ]
- overlayWindow?.isOpaque = false
- overlayWindow?.backgroundColor = .clear
- overlayWindow?.hasShadow = false
- overlayWindow?.titlebarAppearsTransparent = true
- overlayWindow?.titleVisibility = .hidden
- overlayWindow?.isReleasedWhenClosed = false
-
- overlayWindow?.contentView = DismissibleHostingView(
- rootView: ContentView(hideOverlay: { [weak self] in
- self?.hideOverlay()
- }),
- onBackdropTap: { [weak self] in
- self?.hideOverlay()
- }
- )
- }
+ overlayWindow?.orderOut(nil)
+ overlayWindow = makeOverlayWindow(on: screen)
overlayWindow?.setFrame(screen.frame, display: true)
- overlayWindow?.level = .screenSaver
+ overlayWindow?.level = NSWindow.Level(rawValue: Int(CGWindowLevelForKey(.maximumWindow)))
// Local key monitor: catch Escape while overlay is up
NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in
@@ -263,12 +243,47 @@
overlayWindow?.makeKeyAndOrderFront(nil)
overlayWindow?.orderFrontRegardless()
- NSApp.activate(ignoringOtherApps: true)
}
- private func hideOverlay() {
- guard !isInEditMode else { return }
+ private func makeOverlayWindow(on screen: NSScreen) -> NSWindow {
+ let panel = OverlayPanel(
+ contentRect: screen.frame,
+ styleMask: [.borderless, .fullSizeContentView, .nonactivatingPanel],
+ backing: .buffered,
+ defer: false
+ )
+ panel.isFloatingPanel = true
+ panel.hidesOnDeactivate = false
+ panel.collectionBehavior = [
+ .moveToActiveSpace,
+ .fullScreenAuxiliary,
+ .stationary,
+ .transient,
+ .ignoresCycle
+ ]
+ panel.isOpaque = false
+ panel.backgroundColor = .clear
+ 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)
+ }),
+ onBackdropTap: { [weak self] in
+ self?.hideOverlay()
+ }
+ )
+ return panel
+ }
+
+ private func hideOverlay(force: Bool = false) {
+ guard force || !isInEditMode else { return }
overlayWindow?.orderOut(nil)
+ if force {
+ overlayWindow = nil
+ }
}
// MARK: - Global Hotkey (Shift+Option+Space)
@@ -293,7 +308,7 @@
hotkeyRef = ref
if status != noErr {
- print("[Apptag] Hotkey registration failed: \(status). Falling back to menu bar only.")
+ print("[TagLauncher] Hotkey registration failed: \(status). Falling back to menu bar only.")
return
}
@@ -341,19 +356,54 @@
// 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
+ self.prepareSettingsWindow(keyWindow)
return
}
self.hideOverlay()
}
+ }
+
+ /// 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: max(window.frame.height, 420))
+ window.minSize = NSSize(width: 880, height: 420)
+ window.maxSize = NSSize(width: 880, height: CGFloat.greatestFiniteMagnitude)
+ if abs(window.frame.width - settingsSize.width) > 0.5 || window.frame.height < settingsSize.height {
+ window.setFrame(
+ NSRect(origin: window.frame.origin, size: settingsSize),
+ display: false
+ )
+ }
+
+ if let overlayWindow, overlayWindow.isVisible {
+ center(window, over: overlayWindow.frame)
+ window.level = NSWindow.Level(rawValue: overlayWindow.level.rawValue + 1)
+ } else if let screen = screenUnderMouse() {
+ center(window, over: screen.visibleFrame)
+ window.level = .floating
+ }
+
+ window.collectionBehavior.formUnion([.moveToActiveSpace, .fullScreenAuxiliary])
+ window.makeKeyAndOrderFront(nil)
+ window.orderFrontRegardless()
+ settingsWindow = window
+ }
+
+ private func center(_ window: NSWindow, over rect: NSRect) {
+ let frame = window.frame
+ let origin = NSPoint(
+ x: rect.midX - frame.width / 2,
+ y: rect.midY - frame.height / 2
+ )
+ window.setFrameOrigin(origin)
+ }
+
+ private func screenUnderMouse() -> 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.
@@ -374,7 +424,7 @@
/// Track whether the overlay is in edit mode to suppress auto-dismiss.
private func observeEditMode() {
NotificationCenter.default.addObserver(
- forName: .apptagEditModeChanged,
+ forName: .tagLauncherEditModeChanged,
object: nil,
queue: .main
) { [weak self] notification in
@@ -384,15 +434,26 @@
@objc private func openPreferences() {
// 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)
+ prepareSettingsWindowWhenAvailable(retries: 5)
+ }
+
+ private func prepareSettingsWindowWhenAvailable(retries: Int) {
+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.03) { [weak self] in
+ guard let self else { return }
+ let candidates = NSApp.windows.filter { window in
+ window != self.overlayWindow && window.isVisible
+ }
+ candidates.forEach { self.prepareSettingsWindow($0) }
+ if candidates.isEmpty && retries > 0 {
+ self.prepareSettingsWindowWhenAvailable(retries: retries - 1)
+ }
+ }
}
@objc private func switchLanguage(_ sender: NSMenuItem) {
guard let code = sender.representedObject as? String else { return }
L10n.switchTo(code)
- // Rebuild menu to update checkmarks
- setupMenuBar()
}
}
@@ -472,6 +533,12 @@
// MARK: - Preferences View
struct PreferencesView: View {
+ private let settingsWindowWidth: CGFloat = 880
+ private let settingsContentWidth: CGFloat = 820
+ private let settingsLabelWidth: CGFloat = 160
+ private let widePickerWidth: CGFloat = 650
+ private let compactPickerWidth: CGFloat = 320
+
@AppStorage("tagFontSize") private var tagFontSize: Double = 18
@AppStorage("iconSize") private var iconSize: Double = 56
@AppStorage("tagPosition") private var tagPosition = "left"
@@ -480,6 +547,9 @@
@AppStorage("hideAppNames") private var hideAppNames = false
@AppStorage("showDockIcon") private var showDockIcon = false
@AppStorage("launchAtLogin") private var launchAtLogin = true
+ @State private var selectedLanguage = L10n.currentCode
+ @State private var languageRefreshID = UUID()
+ @State private var isRefreshingLanguage = false
@State private var allApps: [AppInfo] = []
@State private var tagColors: [String: Int] = [:]
@@ -499,14 +569,14 @@
private func exportTags() {
let panel = NSSavePanel()
panel.title = tr("settings.export")
- panel.nameFieldStringValue = "Apptag-tags.json"
+ panel.nameFieldStringValue = "TagLauncher-tags.json"
panel.allowedContentTypes = [.json]
panel.begin { response in
guard response == .OK, let url = panel.url else { return }
do {
try TagDatabase.exportTo(url)
} catch {
- fputs("[Apptag] Export failed: \(error)\n", stderr)
+ fputs("[TagLauncher] Export failed: \(error)\n", stderr)
}
}
}
@@ -522,7 +592,7 @@
_ = try TagDatabase.importFrom(url)
scanApps()
} catch {
- fputs("[Apptag] Import failed: \(error)\n", stderr)
+ fputs("[TagLauncher] Import failed: \(error)\n", stderr)
// Show alert on failure
let alert = NSAlert()
alert.messageText = tr("settings.importFailed")
@@ -541,8 +611,27 @@
}
var body: some View {
- TabView {
- // Tab 1: General
+ ZStack {
+ TabView {
+ // Tab 1: Language
+ Form {
+ Section {
+ Picker(tr("settings.languagePicker"), selection: $selectedLanguage) {
+ ForEach(L10n.supported, id: \.code) { language in
+ Text(language.name).tag(language.code)
+ }
+ }
+ .pickerStyle(.radioGroup)
+ } header: {
+ Text(tr("settings.language"))
+ } footer: {
+ Text(tr("settings.languageDesc"))
+ }
+ }
+ .tabItem { Label(tr("settings.language"), systemImage: "globe") }
+ .padding()
+
+ // Tab 2: General
VStack(alignment: .leading, spacing: 0) {
// Toggle row — centered as a rectangular block
HStack(spacing: 20) {
@@ -568,14 +657,17 @@
VStack(spacing: 16) {
HStack(alignment: .top, spacing: 16) {
Text(tr("settings.appListStyle"))
- .frame(width: 130, alignment: .trailing)
+ .frame(width: settingsLabelWidth, alignment: .trailing)
VStack(alignment: .leading, spacing: 4) {
Picker("", selection: $displayMode) {
Text(tr("settings.flat")).tag("flat")
Text(tr("settings.container")).tag("container")
+ Text(tr("settings.coloredContainer")).tag("coloredContainer")
+ Text(tr("settings.gridContainer")).tag("gridContainer")
+ Text(tr("settings.coloredGridContainer")).tag("coloredGridContainer")
}
.pickerStyle(.segmented)
- .frame(width: 280, alignment: .leading)
+ .frame(width: widePickerWidth, alignment: .leading)
Text(tr("settings.flatDesc"))
.font(.caption).foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
@@ -583,7 +675,7 @@
}
HStack(alignment: .top, spacing: 16) {
Text(tr("settings.tagPosition"))
- .frame(width: 130, alignment: .trailing)
+ .frame(width: settingsLabelWidth, alignment: .trailing)
VStack(alignment: .leading, spacing: 4) {
Picker("", selection: $tagPosition) {
Text(tr("settings.left")).tag("left")
@@ -591,7 +683,7 @@
Text(tr("settings.top")).tag("top")
}
.pickerStyle(.segmented)
- .frame(width: 280, alignment: .leading)
+ .frame(width: compactPickerWidth, alignment: .leading)
Text(tr("settings.tagPosDesc"))
.font(.caption).foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
@@ -599,7 +691,7 @@
}
HStack(alignment: .top, spacing: 16) {
Text(tr("settings.tagFontSize"))
- .frame(width: 130, alignment: .trailing)
+ .frame(width: settingsLabelWidth, 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
@@ -607,7 +699,7 @@
}
}
.pickerStyle(.segmented)
- .frame(width: 280, alignment: .leading)
+ .frame(width: compactPickerWidth, alignment: .leading)
Text(tr("settings.tagFontDesc"))
.font(.caption).foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
@@ -615,7 +707,7 @@
}
HStack(alignment: .top, spacing: 16) {
Text(tr("settings.iconSize"))
- .frame(width: 130, alignment: .trailing)
+ .frame(width: settingsLabelWidth, 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
@@ -623,7 +715,7 @@
}
}
.pickerStyle(.segmented)
- .frame(width: 280, alignment: .leading)
+ .frame(width: compactPickerWidth, alignment: .leading)
Text(tr("settings.iconSizeDesc"))
.font(.caption).foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
@@ -631,10 +723,11 @@
}
}
}
+ .frame(maxWidth: settingsContentWidth, alignment: .center)
.padding()
.tabItem { Label(tr("settings.general"), systemImage: "gearshape") }
- // Tab 2: Tags
+ // Tab 3: Tags
VStack(spacing: 0) {
TagEditorView(
tagColors: $tagColors,
@@ -646,7 +739,7 @@
.tabItem { Label(tr("settings.tags"), systemImage: "tag.fill") }
.onAppear { scanApps() }
- // Tab 3: Data
+ // Tab 4: Data
Form {
Section {
HStack(spacing: 12) {
@@ -665,7 +758,7 @@
.tabItem { Label(tr("settings.data"), systemImage: "externaldrive.fill") }
.padding()
- // Tab 4: About
+ // Tab 5: About
Form {
Section {
HStack {
@@ -675,7 +768,7 @@
.frame(width: 128, height: 128)
}
VStack(alignment: .leading, spacing: 4) {
- Text("Apptag")
+ Text("TagLauncher")
.font(.title2)
.fontWeight(.semibold)
Text(tr("app.description"))
@@ -701,7 +794,40 @@
}
.tabItem { Label(tr("settings.about"), systemImage: "info.circle") }
.padding()
+ }
+ .id(languageRefreshID)
+ .onChange(of: selectedLanguage) { _, code in
+ L10n.switchTo(code)
+ }
+ .onReceive(NotificationCenter.default.publisher(for: .appLanguageDidChange)) { notification in
+ if let code = notification.userInfo?["code"] as? String {
+ selectedLanguage = code
+ }
+ showLanguageRefresh()
+ }
+
+ if isRefreshingLanguage {
+ ZStack {
+ Color(nsColor: .windowBackgroundColor)
+ .opacity(0.84)
+ Image(systemName: "arrow.clockwise")
+ .font(.system(size: 30, weight: .regular))
+ .symbolRenderingMode(.hierarchical)
+ .foregroundStyle(.secondary)
+ }
+ .transition(.opacity)
+ }
}
- .frame(minWidth: 660, maxWidth: 660, minHeight: 380)
+ .frame(minWidth: settingsWindowWidth, maxWidth: settingsWindowWidth, minHeight: 420)
+ }
+
+ private func showLanguageRefresh() {
+ isRefreshingLanguage = true
+ languageRefreshID = UUID()
+ DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
+ withAnimation(.easeOut(duration: 0.18)) {
+ isRefreshingLanguage = false
+ }
+ }
}
}
--
Gitblit v1.9.3