fix(macos): normalize settings pane margins · openclaw/openclaw@13deea2

Recent Commits to openclaw:main

steipete · 2026-05-18 · via Recent Commits to openclaw:main

File tree

apps/macos/Sources/OpenClaw

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ Docs: https://docs.openclaw.ai`
`87`	`87`	`- UI: show reasoning choices as plain labels instead of leaking internal override wording in session and chat pickers.`
`88`	`88`	`- Mac app: avoid repeating the Configuration heading inside channel quick settings.`
`89`	`89`	`- Mac app: keep the Settings sidebar always visible and remove the redundant titlebar hide/show control.`
	`90`	`+- Mac app: normalize Settings pane content margins so pages share the same left and right rail.`
`90`	`91`	`- 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.`
`91`	`92`	`- 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.`
`92`	`93`	`- Mac app: keep app-level menu commands and Dashboard failure states reachable when the remote Gateway is disconnected.`

Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,7 @@ struct AboutSettings: View {`
`85`	`85`	`Spacer()`
`86`	`86`	`}`
`87`	`87`	`.frame(maxWidth: .infinity, maxHeight: .infinity)`
`88`		`-.padding(.top, 4)`
`89`		`-.padding(.horizontal, 24)`
`90`		`-.padding(.bottom, 24)`
	`88`	`+.settingsDetailContent()`
`91`	`89`	`.onAppear {`
`92`	`90`	`guard let updater, !self.didLoadUpdaterState else { return }`
`93`	`91`	`// Keep Sparkle’s auto-check setting in sync with the persisted toggle.`

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
`@@ -32,8 +32,7 @@ struct InstancesSettings: View {`
`32`	`32`	`Spacer()`
`33`	`33`	`}`
`34`	`34`	`.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)`
`35`		`-.padding(.leading, 18)`
`36`		`-.padding(.trailing, SettingsLayout.scrollbarGutter)`
	`35`	`+.settingsDetailContent()`
`37`	`36`	`.onAppear { self.updateActiveWork(active: self.isActive) }`
`38`	`37`	`.onChange(of: self.isActive) { _, active in`
`39`	`38`	`self.updateActiveWork(active: active)`

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`	`}`

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,7 @@ struct SessionsSettings: View {`
`24`	`24`	`Spacer()`
`25`	`25`	`}`
`26`	`26`	`.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)`
`27`		`-.padding(.leading, 18)`
`28`		`-.padding(.trailing, SettingsLayout.scrollbarGutter)`
	`27`	`+.settingsDetailContent()`
`29`	`28`	`.task {`
`30`	`29`	`guard !self.hasLoaded else { return }`
`31`	`30`	`guard !self.isPreview else { return }`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main

File tree