Skip to content

Commit 4539e92

Browse files
authored
Merge pull request #10 from hack-dance/squircle
Improve project view status handling
2 parents 15997b0 + f06f84c commit 4539e92

19 files changed

Lines changed: 869 additions & 76 deletions

File tree

.hack/hack.config.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
"dev_host": "hack-cli.hack",
55
"controlPlane": {
66
"extensions": {
7-
"dance.hack.tickets": { "enabled": true }
7+
"dance.hack.tickets": {
8+
"enabled": true
9+
}
810
}
911
}
1012
}

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,11 @@ hack daemon logs
256256
On macOS, you can install `hackd` as a launchd service for automatic management:
257257

258258
```bash
259-
# Install with auto-start on login
260-
hack daemon install --run-at-load
259+
# Install (auto-start on login by default)
260+
hack daemon install
261261

262262
# Install without auto-start (manual start/stop via launchd)
263-
hack daemon install
263+
hack daemon install --no-run-at-load
264264

265265
# Uninstall the launchd service
266266
hack daemon uninstall

apps/macos/Packages/Features/DashboardFeature/Sources/DashboardFeature/DashboardView.swift

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public struct DashboardView: View {
2424
@Bindable var model = model
2525

2626
GeometryReader { proxy in
27-
ZStack {
27+
ZStack(alignment: .top) {
2828
VSplitView {
2929
ZStack {
3030
mainSplitView
@@ -67,6 +67,11 @@ public struct DashboardView: View {
6767
.background(alignment: .top) {
6868
topHeaderChrome
6969
}
70+
GlobalStatusStrip(placement: .titlebar)
71+
.frame(maxWidth: .infinity, alignment: .center)
72+
.padding(.top, 8)
73+
.offset(y: -48)
74+
.zIndex(16)
7075
}
7176
// Attach toolbar at the window root. Nested toolbars inside split views can disappear
7277
// when additional container views are introduced (e.g. a bottom terminal panel).
@@ -99,10 +104,6 @@ public struct DashboardView: View {
99104
}
100105
}
101106
}
102-
ToolbarItem(placement: .principal) {
103-
GlobalStatusStrip(placement: .titlebar)
104-
.frame(maxWidth: .infinity, alignment: .center)
105-
}
106107
ToolbarItemGroup(placement: .primaryAction) {
107108
ToolbarIconButton(
108109
systemImage: "gearshape",
@@ -312,21 +313,11 @@ public struct DashboardView: View {
312313
}
313314

314315
private var titlebarNeutralIconTint: NSColor {
315-
titlebarIconTint(lightOpacity: 0.72, darkOpacity: 0.90)
316+
NSColor.labelColor.withAlphaComponent(0.84)
316317
}
317318

318319
private var titlebarNeutralIconHoverTint: NSColor {
319-
titlebarIconTint(lightOpacity: 0.86, darkOpacity: 1.0)
320-
}
321-
322-
private func titlebarIconTint(lightOpacity: CGFloat, darkOpacity: CGFloat) -> NSColor {
323-
NSColor(name: nil) { appearance in
324-
let isDark = appearance.bestMatch(from: [.darkAqua, .aqua]) == .darkAqua
325-
if isDark {
326-
return NSColor.white.withAlphaComponent(darkOpacity)
327-
}
328-
return NSColor.black.withAlphaComponent(lightOpacity)
329-
}
320+
NSColor.labelColor
330321
}
331322

332323
private var shouldShowGlobalRecoveryOverlay: Bool {

0 commit comments

Comments
 (0)