fix(macos): normalize settings pane margins

steipete · steipete · commit 13deea2a9d65 · 2026-05-18T15:37:36.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -87,6 +87,7 @@ Docs: https://docs.openclaw.ai
 - UI: show reasoning choices as plain labels instead of leaking internal override wording in session and chat pickers.
 - Mac app: avoid repeating the Configuration heading inside channel quick settings.
 - Mac app: keep the Settings sidebar always visible and remove the redundant titlebar hide/show control.
+- Mac app: normalize Settings pane content margins so pages share the same left and right rail.
 - Mac app: prefer explicit private/Tailscale/LAN Gateway endpoints over SSH tunnels, preserve legacy loopback tunnel configs, persist transport choices, and show captured SSH stderr when tunneling really fails.
 - Gateway/sessions: keep ACP/acpx and runtime child sessions visible in configured-only session lists when their owner or parent session belongs to a configured agent.
 - Mac app: keep app-level menu commands and Dashboard failure states reachable when the remote Gateway is disconnected.
diff --git a/apps/macos/Sources/OpenClaw/AboutSettings.swift b/apps/macos/Sources/OpenClaw/AboutSettings.swift
@@ -85,9 +85,7 @@ struct AboutSettings: View {
             Spacer()
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
-        .padding(.top, 4)
-        .padding(.horizontal, 24)
-        .padding(.bottom, 24)
+        .settingsDetailContent()
         .onAppear {
             guard let updater, !self.didLoadUpdaterState else { return }
             // Keep Sparkle’s auto-check setting in sync with the persisted toggle.
diff --git a/apps/macos/Sources/OpenClaw/ChannelsSettings+View.swift b/apps/macos/Sources/OpenClaw/ChannelsSettings+View.swift
@@ -8,6 +8,7 @@ extension ChannelsSettings {
             self.detail
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
+        .settingsDetailContent()
         .onAppear {
             self.updateActiveWork(active: self.isActive)
             self.ensureSelection(in: channels)
@@ -72,8 +73,8 @@ extension ChannelsSettings {
                 .font(.callout)
                 .foregroundStyle(.secondary)
         }
-        .padding(.horizontal, 24)
-        .padding(.vertical, 18)
+        .padding(.horizontal, SettingsLayout.detailHorizontalPadding)
+        .padding(.vertical, SettingsLayout.detailVerticalPadding)
     }
 
     private func channelDetail(_ channel: ChannelItem) -> some View {
@@ -85,8 +86,8 @@ extension ChannelsSettings {
                 Spacer(minLength: 0)
             }
             .frame(maxWidth: .infinity, alignment: .leading)
-            .padding(.horizontal, 24)
-            .padding(.vertical, 18)
+            .padding(.horizontal, SettingsLayout.detailHorizontalPadding)
+            .padding(.vertical, SettingsLayout.detailVerticalPadding)
         }
     }
 
diff --git a/apps/macos/Sources/OpenClaw/ConfigSettings.swift b/apps/macos/Sources/OpenClaw/ConfigSettings.swift
@@ -19,6 +19,7 @@ struct ConfigSettings: View {
             self.detail
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
+        .settingsDetailContent()
         .task {
             guard !self.hasLoaded else { return }
             guard !self.isPreview else { return }
@@ -117,8 +118,8 @@ extension ConfigSettings {
                 .font(.callout)
                 .foregroundStyle(.secondary)
         }
-        .padding(.horizontal, 24)
-        .padding(.vertical, 18)
+        .padding(.horizontal, SettingsLayout.detailHorizontalPadding)
+        .padding(.vertical, SettingsLayout.detailVerticalPadding)
     }
 
     private var schemaUnavailableDetail: some View {
@@ -129,8 +130,8 @@ extension ConfigSettings {
                 .foregroundStyle(.secondary)
             self.actionRow
         }
-        .padding(.horizontal, 24)
-        .padding(.vertical, 18)
+        .padding(.horizontal, SettingsLayout.detailHorizontalPadding)
+        .padding(.vertical, SettingsLayout.detailVerticalPadding)
     }
 
     private func sectionDetail(_ section: ConfigSection) -> some View {
@@ -153,8 +154,8 @@ extension ConfigSettings {
                 Spacer(minLength: 0)
             }
             .frame(maxWidth: .infinity, alignment: .leading)
-            .padding(.horizontal, 24)
-            .padding(.vertical, 18)
+            .padding(.horizontal, SettingsLayout.detailHorizontalPadding)
+            .padding(.vertical, SettingsLayout.detailVerticalPadding)
             .groupBoxStyle(PlainSettingsGroupBoxStyle())
         }
     }
diff --git a/apps/macos/Sources/OpenClaw/CronSettings+Layout.swift b/apps/macos/Sources/OpenClaw/CronSettings+Layout.swift
@@ -9,8 +9,7 @@ extension CronSettings {
             Spacer(minLength: 0)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
-        .padding(.leading, 18)
-        .padding(.trailing, SettingsLayout.scrollbarGutter)
+        .settingsDetailContent()
         .onAppear {
             self.updateActiveWork(active: self.isActive)
         }
diff --git a/apps/macos/Sources/OpenClaw/DebugSettings.swift b/apps/macos/Sources/OpenClaw/DebugSettings.swift
@@ -62,9 +62,7 @@ struct DebugSettings: View {
 
                 Spacer(minLength: 0)
             }
-            .frame(maxWidth: .infinity, alignment: .leading)
-            .padding(.vertical, 4)
-            .padding(.trailing, SettingsLayout.scrollbarGutter)
+            .settingsDetailContent()
             .groupBoxStyle(PlainSettingsGroupBoxStyle())
         }
         .task {
diff --git a/apps/macos/Sources/OpenClaw/GeneralSettings.swift b/apps/macos/Sources/OpenClaw/GeneralSettings.swift
@@ -46,10 +46,7 @@ struct GeneralSettings: View {
                     self.connectionPage
                 }
             }
-            .frame(maxWidth: 760, alignment: .leading)
-            .padding(.bottom, 16)
-            .padding(.leading, 18)
-            .padding(.trailing, SettingsLayout.scrollbarGutter)
+            .settingsDetailContent()
         }
         .onAppear {
             self.updateActiveWork(active: self.isActive)
diff --git a/apps/macos/Sources/OpenClaw/InstancesSettings.swift b/apps/macos/Sources/OpenClaw/InstancesSettings.swift
@@ -32,8 +32,7 @@ struct InstancesSettings: View {
             Spacer()
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
-        .padding(.leading, 18)
-        .padding(.trailing, SettingsLayout.scrollbarGutter)
+        .settingsDetailContent()
         .onAppear { self.updateActiveWork(active: self.isActive) }
         .onChange(of: self.isActive) { _, active in
             self.updateActiveWork(active: active)
diff --git a/apps/macos/Sources/OpenClaw/PermissionsSettings.swift b/apps/macos/Sources/OpenClaw/PermissionsSettings.swift
@@ -36,9 +36,7 @@ struct PermissionsSettings: View {
                     }
                 }
             }
-            .frame(maxWidth: 760, alignment: .leading)
-            .padding(.trailing, SettingsLayout.scrollbarGutter)
-            .padding(.vertical, 4)
+            .settingsDetailContent()
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
     }
diff --git a/apps/macos/Sources/OpenClaw/SessionsSettings.swift b/apps/macos/Sources/OpenClaw/SessionsSettings.swift
@@ -24,8 +24,7 @@ struct SessionsSettings: View {
             Spacer()
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
-        .padding(.leading, 18)
-        .padding(.trailing, SettingsLayout.scrollbarGutter)
+        .settingsDetailContent()
         .task {
             guard !self.hasLoaded else { return }
             guard !self.isPreview else { return }
diff --git a/apps/macos/Sources/OpenClaw/SettingsComponents.swift b/apps/macos/Sources/OpenClaw/SettingsComponents.swift
@@ -3,8 +3,18 @@ import SwiftUI
 enum SettingsLayout {
     static let sidebarWidth: CGFloat = 250
     static let detailHorizontalPadding: CGFloat = 22
+    static let detailVerticalPadding: CGFloat = 18
     static let nestedSidebarWidth: CGFloat = 260
-    static let scrollbarGutter: CGFloat = 36
+    static let detailBottomPadding: CGFloat = 16
+}
+
+extension View {
+    func settingsDetailContent() -> some View {
+        self
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(.vertical, 4)
+            .padding(.bottom, SettingsLayout.detailBottomPadding)
+    }
 }
 
 struct SettingsPageHeader: View {
diff --git a/apps/macos/Sources/OpenClaw/SettingsRootView.swift b/apps/macos/Sources/OpenClaw/SettingsRootView.swift
@@ -84,7 +84,7 @@ struct SettingsRootView: View {
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
         .padding(.horizontal, SettingsLayout.detailHorizontalPadding)
-        .padding(.vertical, 18)
+        .padding(.vertical, SettingsLayout.detailVerticalPadding)
     }
 
     private var cachedDetailTabs: [SettingsTab] {
diff --git a/apps/macos/Sources/OpenClaw/SkillsSettings.swift b/apps/macos/Sources/OpenClaw/SkillsSettings.swift
@@ -27,9 +27,7 @@ struct SkillsSettings: View {
                 self.skillsList
                 Spacer(minLength: 8)
             }
-            .frame(maxWidth: 860, alignment: .leading)
-            .padding(.trailing, SettingsLayout.scrollbarGutter)
-            .padding(.vertical, 4)
+            .settingsDetailContent()
         }
         .task {
             guard !self.didScheduleInitialRefresh else { return }
diff --git a/apps/macos/Sources/OpenClaw/SystemRunSettingsView.swift b/apps/macos/Sources/OpenClaw/SystemRunSettingsView.swift
@@ -12,8 +12,7 @@ struct ExecApprovalsSettings: View {
 
                 SystemRunSettingsView()
             }
-            .frame(maxWidth: .infinity, alignment: .leading)
-            .padding(.vertical, 4)
+            .settingsDetailContent()
         }
     }
 }
diff --git a/apps/macos/Sources/OpenClaw/VoiceWakeSettings.swift b/apps/macos/Sources/OpenClaw/VoiceWakeSettings.swift
@@ -186,9 +186,7 @@ struct VoiceWakeSettings: View {
 
                 Spacer(minLength: 8)
             }
-            .frame(maxWidth: 760, alignment: .leading)
-            .padding(.trailing, SettingsLayout.scrollbarGutter)
-            .padding(.vertical, 4)
+            .settingsDetailContent()
         }
         .task {
             guard !self.isPreview else { return }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ extension ChannelsSettings {`
`8`	`8`	`self.detail`
`9`	`9`	`}`
`10`	`10`	`.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)`
	`11`	`+ .settingsDetailContent()`
`11`	`12`	`.onAppear {`
`12`	`13`	`self.updateActiveWork(active: self.isActive)`
`13`	`14`	`self.ensureSelection(in: channels)`
`@@ -72,8 +73,8 @@ extension ChannelsSettings {`
`72`	`73`	`.font(.callout)`
`73`	`74`	`.foregroundStyle(.secondary)`
`74`	`75`	`}`
`75`		`- .padding(.horizontal, 24)`
`76`		`- .padding(.vertical, 18)`
	`76`	`+ .padding(.horizontal, SettingsLayout.detailHorizontalPadding)`
	`77`	`+ .padding(.vertical, SettingsLayout.detailVerticalPadding)`
`77`	`78`	`}`
`78`	`79`
`79`	`80`	`private func channelDetail(_ channel: ChannelItem) -> some View {`
`@@ -85,8 +86,8 @@ extension ChannelsSettings {`
`85`	`86`	`Spacer(minLength: 0)`
`86`	`87`	`}`
`87`	`88`	`.frame(maxWidth: .infinity, alignment: .leading)`
`88`		`- .padding(.horizontal, 24)`
`89`		`- .padding(.vertical, 18)`
	`89`	`+ .padding(.horizontal, SettingsLayout.detailHorizontalPadding)`
	`90`	`+ .padding(.vertical, SettingsLayout.detailVerticalPadding)`
`90`	`91`	`}`
`91`	`92`	`}`
`92`	`93`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ struct ConfigSettings: View {`
`19`	`19`	`self.detail`
`20`	`20`	`}`
`21`	`21`	`.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)`
	`22`	`+ .settingsDetailContent()`
`22`	`23`	`.task {`
`23`	`24`	`guard !self.hasLoaded else { return }`
`24`	`25`	`guard !self.isPreview else { return }`
`@@ -117,8 +118,8 @@ extension ConfigSettings {`
`117`	`118`	`.font(.callout)`
`118`	`119`	`.foregroundStyle(.secondary)`
`119`	`120`	`}`
`120`		`- .padding(.horizontal, 24)`
`121`		`- .padding(.vertical, 18)`
	`121`	`+ .padding(.horizontal, SettingsLayout.detailHorizontalPadding)`
	`122`	`+ .padding(.vertical, SettingsLayout.detailVerticalPadding)`
`122`	`123`	`}`
`123`	`124`
`124`	`125`	`private var schemaUnavailableDetail: some View {`
`@@ -129,8 +130,8 @@ extension ConfigSettings {`
`129`	`130`	`.foregroundStyle(.secondary)`
`130`	`131`	`self.actionRow`
`131`	`132`	`}`
`132`		`- .padding(.horizontal, 24)`
`133`		`- .padding(.vertical, 18)`
	`133`	`+ .padding(.horizontal, SettingsLayout.detailHorizontalPadding)`
	`134`	`+ .padding(.vertical, SettingsLayout.detailVerticalPadding)`
`134`	`135`	`}`
`135`	`136`
`136`	`137`	`private func sectionDetail(_ section: ConfigSection) -> some View {`
`@@ -153,8 +154,8 @@ extension ConfigSettings {`
`153`	`154`	`Spacer(minLength: 0)`
`154`	`155`	`}`
`155`	`156`	`.frame(maxWidth: .infinity, alignment: .leading)`
`156`		`- .padding(.horizontal, 24)`
`157`		`- .padding(.vertical, 18)`
	`157`	`+ .padding(.horizontal, SettingsLayout.detailHorizontalPadding)`
	`158`	`+ .padding(.vertical, SettingsLayout.detailVerticalPadding)`
`158`	`159`	`.groupBoxStyle(PlainSettingsGroupBoxStyle())`
`159`	`160`	`}`
`160`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@ extension CronSettings {`
`9`	`9`	`Spacer(minLength: 0)`
`10`	`10`	`}`
`11`	`11`	`.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)`
`12`		`- .padding(.leading, 18)`
`13`		`- .padding(.trailing, SettingsLayout.scrollbarGutter)`
	`12`	`+ .settingsDetailContent()`
`14`	`13`	`.onAppear {`
`15`	`14`	`self.updateActiveWork(active: self.isActive)`
`16`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,7 @@ struct DebugSettings: View {`
`62`	`62`
`63`	`63`	`Spacer(minLength: 0)`
`64`	`64`	`}`
`65`		`- .frame(maxWidth: .infinity, alignment: .leading)`
`66`		`- .padding(.vertical, 4)`
`67`		`- .padding(.trailing, SettingsLayout.scrollbarGutter)`
	`65`	`+ .settingsDetailContent()`
`68`	`66`	`.groupBoxStyle(PlainSettingsGroupBoxStyle())`
`69`	`67`	`}`
`70`	`68`	`.task {`
Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,7 @@ struct GeneralSettings: View {`
`46`	`46`	`self.connectionPage`
`47`	`47`	`}`
`48`	`48`	`}`
`49`		`- .frame(maxWidth: 760, alignment: .leading)`
`50`		`- .padding(.bottom, 16)`
`51`		`- .padding(.leading, 18)`
`52`		`- .padding(.trailing, SettingsLayout.scrollbarGutter)`
	`49`	`+ .settingsDetailContent()`
`53`	`50`	`}`
`54`	`51`	`.onAppear {`
`55`	`52`	`self.updateActiveWork(active: self.isActive)`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,7 @@ struct PermissionsSettings: View {`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`}`
`39`		`- .frame(maxWidth: 760, alignment: .leading)`
`40`		`- .padding(.trailing, SettingsLayout.scrollbarGutter)`
`41`		`- .padding(.vertical, 4)`
	`39`	`+ .settingsDetailContent()`
`42`	`40`	`}`
`43`	`41`	`.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)`
`44`	`42`	`}`