crazy-macs/tag-launcher.git

			@@ -203,6 +203,7 @@
			@State private var selectedTagNames: Set<String> = []
			@State private var successToast: String? = nil
			@State private var draggedTagNames: [String] = [] // live drag order
			@State private var dragItem: String? = nil // currently dragged tag

			// Configurable defaults
			@AppStorage("defaultGroupName") private var defaultGroupName = "Other"
			@@ -210,6 +211,8 @@
			@AppStorage("iconSize") private var iconSize: Double = 56
			@AppStorage("tagPosition") private var tagPosition = "left"
			@State private var notchHeight: CGFloat = 0
			@AppStorage("displayMode") private var displayMode = "flat"
			@AppStorage("hideAppNames") private var hideAppNames = false

			private var isSideLayout: Bool {
			tagPosition == "left" \|\| tagPosition == "right"
			@@ -363,23 +366,112 @@
			Spacer()
			ProgressView().scaleEffect(0.8)
			Spacer()
			} else if displayMode == "container" {
			containerGrid
			} else {
			ScrollViewReader { proxy in
			ScrollView {
			LazyVStack(alignment: .leading, spacing: 24) {
			ForEach(groups) { group in
			TagGroupView(
			group: group,
			onSelectApp: { app in openApp(app) },
			tagFontSize: tagFontSize,
			iconSize: iconSize
			).id(group.id)
			flatGrid
			}
			}
			}

			private var flatGrid: some View {
			ScrollViewReader { proxy in
			ScrollView {
			LazyVStack(alignment: .leading, spacing: 24) {
			ForEach(groups) { group in
			TagGroupView(
			group: group,
			onSelectApp: { app in openApp(app) },
			tagFontSize: tagFontSize,
			iconSize: iconSize,
			showNames: !hideAppNames
			).id(group.id)
			}
			}.padding(20)
			}.onAppear { scrollProxy = proxy }
			}
			}

			private var containerGrid: some View {
			GeometryReader { geo in
			let outerPad: CGFloat = 20
			let gap: CGFloat = 16
			let available = geo.size.width - outerPad * 2
			let colW: CGFloat = 280
			let colCount = max(1, Int((available + gap) / (colW + gap)))
			let actualColW = (available - gap * CGFloat(colCount - 1)) / CGFloat(colCount)

			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)
			}
			}.padding(20)
			}.onAppear { scrollProxy = proxy }
			}
			}
			}
			.padding(outerPad)
			}
			}
			}

			/// Distribute groups to the shortest column.
			private func distributeToColumns(groups: [TagGroup], colCount: Int, colWidth: CGFloat) -> [[TagGroup]] {
			var cols = Array(repeating: [TagGroup](), count: colCount)
			var h = Array(repeating: CGFloat(0), count: colCount)
			for g in groups {
			let est = estimatedCardHeight(g, width: colWidth)
			let ci = h.firstIndex(of: h.min()!)!
			cols[ci].append(g)
			h[ci] += est + 16
			}
			return cols
			}

			private func estimatedCardHeight(_ group: TagGroup, width: CGFloat) -> CGFloat {
			let inner = width - 32
			let itemW = iconSize + 28 + 6
			let perRow = max(1, Int(inner / itemW))
			let rows = (group.apps.count + perRow - 1) / perRow
			return 32 + CGFloat(rows) * (iconSize + 30)
			}

			private func masonryCard(_ group: TagGroup, width: CGFloat) -> some View {
			VStack(alignment: .leading, spacing: 6) {
			HStack(spacing: 0) {
			Rectangle().fill(.secondary.opacity(0.25)).frame(height: 1)
			Text(group.name)
			.font(.system(size: tagFontSize, weight: .semibold))
			.foregroundStyle(.secondary)
			.lineLimit(1)
			.truncationMode(.middle)
			.padding(.horizontal, 10)
			Rectangle().fill(.secondary.opacity(0.25)).frame(height: 1)
			}
			let itemSize = iconSize + 28
			LazyVGrid(
			columns: [GridItem(.adaptive(minimum: itemSize, maximum: itemSize + 36), spacing: 6)],
			spacing: 2
			) {
			ForEach(group.apps) { app in
			AppGridItem(app: app, iconSize: iconSize, showName: !hideAppNames, onSelect: { openApp(app) })
			}
			}
			}
			.frame(maxWidth: width)
			.padding(16)
			.background(
			RoundedRectangle(cornerRadius: 14)
			.fill(.ultraThinMaterial)
			)
			.overlay(
			RoundedRectangle(cornerRadius: 14)
			.stroke(Color.primary.opacity(0.08), lineWidth: 1)
			)
			}

			// MARK: - Edit Tags View
			@@ -438,23 +530,32 @@
			HStack(spacing: 0) {
			VStack(alignment: .leading, spacing: 4) {
			Text("Select tags:").font(.caption).foregroundStyle(.secondary).padding(.bottom, 4)
			List {
			ForEach(sortedTagNames, id: \.self) { tagName in
			selectableTagItem(tagName)
			}
			.onMove { from, to in
			var names = sortedTagNames
			names.move(fromOffsets: from, toOffset: to)
			// Persist the new order
			let fullOrder = TagEditor.orderedTagNames()
			let otherTags = fullOrder.filter { !names.contains($0) }
			draggedTagNames = names + otherTags
			TagEditor.reorderTags(draggedTagNames)
			}
			}
			.listStyle(.plain)
			.scrollContentBackground(.hidden)
			.frame(width: 170)
			Text("Drag to reorder").font(.caption2).foregroundStyle(.tertiary).padding(.bottom, 2)
			ScrollView(.vertical, showsIndicators: false) {
			VStack(spacing: 4) {
			ForEach(sortedTagNames, id: \.self) { tagName in
			selectableTagItem(tagName)
			.onDrag {
			dragItem = tagName
			return NSItemProvider(object: tagName as NSString)
			}
			.onDrop(of: [.text], isTargeted: nil) { providers, _ in
			guard let fromName = dragItem,
			var names = draggedTagNames as [String]?,
			let fromIdx = names.firstIndex(of: fromName),
			let toIdx = names.firstIndex(of: tagName),
			fromIdx != toIdx
			else { return false }
			let toOffset = toIdx > fromIdx ? toIdx + 1 : toIdx
			names.move(fromOffsets: [fromIdx], toOffset: toOffset)
			draggedTagNames = names
			TagEditor.reorderTags(names)
			dragItem = nil
			return true
			}
			}
			}.padding(12)
			}.frame(width: 155)
			}
			Rectangle().fill(.secondary.opacity(0.12)).frame(width: 1)

			@@ -497,22 +598,21 @@

			private func selectableTagItem(_ tagName: String) -> some View {
			let isSelected = selectedTagNames.contains(tagName)
			return Button {
			if isSelected { selectedTagNames.remove(tagName) } else { selectedTagNames.insert(tagName) }
			} label: {
			HStack(spacing: 6) {
			Circle()
			.fill(isSelected ? Color.accentColor : Color.secondary.opacity(0.3))
			.frame(width: 16, height: 16)
			.overlay(isSelected ? Image(systemName: "checkmark").font(.system(size: 8, weight: .bold)).foregroundStyle(.white) : nil)
			Text(tagName).font(.system(size: 13, weight: .medium)).foregroundStyle(.primary)
			}
			.padding(.horizontal, 10).padding(.vertical, 5)
			.frame(maxWidth: .infinity, alignment: .leading)
			.background(RoundedRectangle(cornerRadius: 6)
			.fill(Color(nsColor: TagColor.nsColor(for: tagColors[tagName] ?? 0).withAlphaComponent(0.3))))
			return HStack(spacing: 6) {
			Circle()
			.fill(isSelected ? Color.accentColor : Color.secondary.opacity(0.3))
			.frame(width: 16, height: 16)
			.overlay(isSelected ? Image(systemName: "checkmark").font(.system(size: 8, weight: .bold)).foregroundStyle(.white) : nil)
			Text(tagName).font(.system(size: 13, weight: .medium)).foregroundStyle(.primary)
			}
			.buttonStyle(.plain)
			.padding(.horizontal, 10).padding(.vertical, 5)
			.frame(maxWidth: .infinity, alignment: .leading)
			.background(RoundedRectangle(cornerRadius: 6)
			.fill(Color(nsColor: TagColor.nsColor(for: tagColors[tagName] ?? 0).withAlphaComponent(0.3))))
			.contentShape(RoundedRectangle(cornerRadius: 6))
			.onTapGesture {
			if isSelected { selectedTagNames.remove(tagName) } else { selectedTagNames.insert(tagName) }
			}
			}

			private func confirmAssign() {