From 6ec832e63368345e1d2ba99e68dfad8ce2a4fc29 Mon Sep 17 00:00:00 2001
From: Ariver <ar@MacBook-Air.local>
Date: Sun, 10 May 2026 19:28:32 +0800
Subject: [PATCH] Fix overlay visibility in fullscreen spaces
---
Apptag/ContentView.swift | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/Apptag/ContentView.swift b/Apptag/ContentView.swift
index 4a4e4f4..e28b132 100644
--- a/Apptag/ContentView.swift
+++ b/Apptag/ContentView.swift
@@ -4,7 +4,6 @@
// MARK: - Notification for manual re-index
extension Notification.Name {
- static let apptagReindex = Notification.Name("ApptagReindex")
static let apptagEditModeChanged = Notification.Name("ApptagEditModeChanged")
}
@@ -204,6 +203,7 @@
@State private var successToast: String? = nil
@State private var draggedTagNames: [String] = [] // live drag order
@State private var dragItem: String? = nil // currently dragged tag
+ @State private var highlightedGroup: String? = nil // container highlight
// Configurable defaults
@AppStorage("defaultGroupName") private var defaultGroupName = "Other"
@@ -254,9 +254,6 @@
.onReceive(NotificationCenter.default.publisher(for: NSApplication.didBecomeActiveNotification)) { _ in
refreshApps()
}
- .onReceive(NotificationCenter.default.publisher(for: .apptagReindex)) { _ in
- refreshApps()
- }
.onChange(of: editPhase) { _, newPhase in
let active = newPhase != .none
NotificationCenter.default.post(
@@ -272,10 +269,10 @@
if phase != .none {
NotificationCenter.default.post(name: .apptagEditModeChanged, object: nil, userInfo: ["active": true])
NSApp.activate(ignoringOtherApps: true)
- // Sync drag order from database when entering edit mode
- if draggedTagNames.isEmpty {
- draggedTagNames = TagEditor.orderedTagNames()
- }
+ // Always sync tag list from database when entering edit mode
+ let store = TagDatabase.load()
+ tagColors = store.tags.mapValues { $0.color }
+ draggedTagNames = TagEditor.orderedTagNames()
}
editPhase = phase
if phase == .none {
@@ -339,7 +336,14 @@
HStack(spacing: 8) {
ForEach(tagLabels) { tag in
TagPill(name: tag.name, colorIndex: tag.colorIndex,
- action: { scrollTo(tag.id) })
+ action: {
+ if highlightedGroup == tag.id { highlightedGroup = nil }
+ else { highlightedGroup = tag.id }
+ scrollTo(tag.id)
+ })
+ .onHover { hovering in
+ if hovering { scrollTo(tag.id) }
+ }
}
}.padding(.horizontal, 24)
}
@@ -350,7 +354,14 @@
VStack(spacing: 6) {
ForEach(tagLabels) { tag in
SideTagPill(name: tag.name, colorIndex: tag.colorIndex,
- action: { scrollTo(tag.id) })
+ action: {
+ if highlightedGroup == tag.id { highlightedGroup = nil }
+ else { highlightedGroup = tag.id }
+ scrollTo(tag.id)
+ })
+ .onHover { hovering in
+ if hovering { scrollTo(tag.id) }
+ }
}
}.padding(12)
}.frame(width: 135)
@@ -388,7 +399,9 @@
).id(group.id)
}
}.padding(20)
- }.onAppear { scrollProxy = proxy }
+ }
+ .id(displayMode) // force rebuild on mode switch
+ .onAppear { scrollProxy = proxy }
}
}
@@ -403,18 +416,22 @@
let columns = distributeToColumns(groups: groups, colCount: colCount, colWidth: actualColW)
- ScrollView {
- HStack(alignment: .top, spacing: gap) {
- ForEach(0..<colCount, id: \.self) { ci in
- LazyVStack(spacing: gap) {
- ForEach(columns[ci]) { group in
- masonryCard(group, width: actualColW)
- .id(group.id)
+ ScrollViewReader { proxy in
+ ScrollView {
+ HStack(alignment: .top, spacing: gap) {
+ ForEach(0..<colCount, id: \.self) { ci in
+ LazyVStack(spacing: gap) {
+ ForEach(columns[ci]) { group in
+ masonryCard(group, width: actualColW)
+ .id(group.id)
+ }
}
}
}
+ .padding(outerPad)
}
- .padding(outerPad)
+ .id(displayMode) // force rebuild on mode switch
+ .onAppear { scrollProxy = proxy }
}
}
}
@@ -441,16 +458,21 @@
}
private func masonryCard(_ group: TagGroup, width: CGFloat) -> some View {
- VStack(alignment: .leading, spacing: 6) {
+ let isHL = highlightedGroup == group.name
+ let hlColor = Color(nsColor: TagColor.nsColor(for: tagColors[group.name] ?? 0))
+ return VStack(alignment: .leading, spacing: 6) {
HStack(spacing: 0) {
Rectangle().fill(.secondary.opacity(0.25)).frame(height: 1)
+ .layoutPriority(0)
Text(group.name)
.font(.system(size: tagFontSize, weight: .semibold))
.foregroundStyle(.secondary)
.lineLimit(1)
.truncationMode(.middle)
.padding(.horizontal, 10)
+ .layoutPriority(1)
Rectangle().fill(.secondary.opacity(0.25)).frame(height: 1)
+ .layoutPriority(0)
}
let itemSize = iconSize + 28
LazyVGrid(
@@ -470,7 +492,8 @@
)
.overlay(
RoundedRectangle(cornerRadius: 14)
- .stroke(Color.primary.opacity(0.08), lineWidth: 1)
+ .stroke(isHL ? hlColor : Color.primary.opacity(0.08),
+ lineWidth: isHL ? 3 : 1)
)
}
--
Gitblit v1.9.3