fix(macos): keep Settings below native titlebar controls (#102663)

steipete · web-flow · commit 201acd4e7a4a · 2026-07-09T11:41:29.000+01:00
* fix(macos): clear settings titlebar controls

* chore: leave release notes to release automation
diff --git a/apps/macos/Sources/OpenClaw/DashboardWindowController.swift b/apps/macos/Sources/OpenClaw/DashboardWindowController.swift
@@ -206,7 +206,10 @@ final class DashboardWindowController: NSWindowController, WKNavigationDelegate,
           --openclaw-native-titlebar-height: 50px;
         }
         @media (min-width: 700px) {
-          html.openclaw-native-macos .sidebar-shell {
+          /* Both desktop navigation surfaces must clear AppKit's window controls
+             and drag regions or their first interactive row becomes unreachable. */
+          html.openclaw-native-macos .sidebar-shell,
+          html.openclaw-native-macos .settings-sidebar__header {
             padding-top: max(14px, var(--openclaw-native-titlebar-height)) !important;
           }
         }
diff --git a/apps/macos/Tests/OpenClawIPCTests/DashboardWindowSmokeTests.swift b/apps/macos/Tests/OpenClawIPCTests/DashboardWindowSmokeTests.swift
@@ -43,6 +43,20 @@ struct DashboardWindowSmokeTests {
         #expect(dashboardLogString(for: url) == "http://127.0.0.1:18789/control/")
     }
 
+    @Test func `dashboard native chrome clears both desktop sidebars`() throws {
+        let url = try #require(URL(string: "http://127.0.0.1:18789/control/"))
+        let controller = DashboardWindowController(
+            url: url,
+            auth: DashboardWindowAuth(gatewayUrl: nil, token: nil, password: nil))
+        let chromeScript = try #require(controller._testUserScripts.first {
+            $0.source.contains("openclaw-native-macos-chrome")
+        })
+
+        #expect(chromeScript.source.contains(".sidebar-shell"))
+        #expect(chromeScript.source.contains(".settings-sidebar__header"))
+        #expect(chromeScript.source.contains("--openclaw-native-titlebar-height"))
+    }
+
     @Test func `dashboard failure state opens in dashboard window`() throws {
         let url = try #require(URL(string: "http://127.0.0.1:18789/control/"))
         let controller = DashboardWindowController(

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,10 @@ final class DashboardWindowController: NSWindowController, WKNavigationDelegate,`
`206`	`206`	`--openclaw-native-titlebar-height: 50px;`
`207`	`207`	`}`
`208`	`208`	`@media (min-width: 700px) {`
`209`		`- html.openclaw-native-macos .sidebar-shell {`
	`209`	`+ /* Both desktop navigation surfaces must clear AppKit's window controls`
	`210`	`+ and drag regions or their first interactive row becomes unreachable. */`
	`211`	`+ html.openclaw-native-macos .sidebar-shell,`
	`212`	`+ html.openclaw-native-macos .settings-sidebar__header {`
`210`	`213`	`padding-top: max(14px, var(--openclaw-native-titlebar-height)) !important;`
`211`	`214`	`}`
`212`	`215`	`}`