From a931a299dea5fc18012bacc8f8cef1a0fcc53be2 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Fri, 20 Jan 2023 11:09:46 +0100 Subject: [PATCH] Settings should not show indent guides. Simple fix --- .../preferences/browser/settingsTree.ts | 38 ++++++++++--------- .../contrib/preferences/browser/tocTree.ts | 38 +++++++++++-------- 2 files changed, 43 insertions(+), 33 deletions(-) diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts index 27c1a4523ada0..1405d122f435d 100644 --- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts +++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts @@ -2281,23 +2281,27 @@ export class SettingsTree extends WorkbenchObjectTree { this.getHTMLElement().classList.add('settings-editor-tree'); - this.style(getListStyles({ - listBackground: editorBackground, - listActiveSelectionBackground: editorBackground, - listActiveSelectionForeground: foreground, - listFocusAndSelectionBackground: editorBackground, - listFocusAndSelectionForeground: foreground, - listFocusBackground: editorBackground, - listFocusForeground: foreground, - listHoverForeground: foreground, - listHoverBackground: editorBackground, - listHoverOutline: editorBackground, - listFocusOutline: editorBackground, - listInactiveSelectionBackground: editorBackground, - listInactiveSelectionForeground: foreground, - listInactiveFocusBackground: editorBackground, - listInactiveFocusOutline: editorBackground - })); + this.style({ + ...getListStyles({ + listBackground: editorBackground, + listActiveSelectionBackground: editorBackground, + listActiveSelectionForeground: foreground, + listFocusAndSelectionBackground: editorBackground, + listFocusAndSelectionForeground: foreground, + listFocusBackground: editorBackground, + listFocusForeground: foreground, + listHoverForeground: foreground, + listHoverBackground: editorBackground, + listHoverOutline: editorBackground, + listFocusOutline: editorBackground, + listInactiveSelectionBackground: editorBackground, + listInactiveSelectionForeground: foreground, + listInactiveFocusBackground: editorBackground, + listInactiveFocusOutline: editorBackground, + }), + treeIndentGuidesStroke: undefined, + treeInactiveIndentGuidesStroke: undefined, + }); this.disposables.add(configurationService.onDidChangeConfiguration(e => { if (e.affectsConfiguration('workbench.list.smoothScrolling')) { diff --git a/src/vs/workbench/contrib/preferences/browser/tocTree.ts b/src/vs/workbench/contrib/preferences/browser/tocTree.ts index 1fc166f3065f4..b56022e4e0119 100644 --- a/src/vs/workbench/contrib/preferences/browser/tocTree.ts +++ b/src/vs/workbench/contrib/preferences/browser/tocTree.ts @@ -231,21 +231,27 @@ export class TOCTree extends WorkbenchObjectTree { configurationService, ); - this.style(getListStyles({ - listBackground: editorBackground, - listFocusOutline: focusBorder, - listActiveSelectionBackground: editorBackground, - listActiveSelectionForeground: settingsHeaderForeground, - listFocusAndSelectionBackground: editorBackground, - listFocusAndSelectionForeground: settingsHeaderForeground, - listFocusBackground: editorBackground, - listFocusForeground: settingsHeaderHoverForeground, - listHoverForeground: settingsHeaderHoverForeground, - listHoverBackground: editorBackground, - listInactiveSelectionBackground: editorBackground, - listInactiveSelectionForeground: settingsHeaderForeground, - listInactiveFocusBackground: editorBackground, - listInactiveFocusOutline: editorBackground - })); + this.style({ + ...getListStyles({ + listBackground: editorBackground, + listFocusOutline: focusBorder, + listActiveSelectionBackground: editorBackground, + listActiveSelectionForeground: settingsHeaderForeground, + listFocusAndSelectionBackground: editorBackground, + listFocusAndSelectionForeground: settingsHeaderForeground, + listFocusBackground: editorBackground, + listFocusForeground: settingsHeaderHoverForeground, + listHoverForeground: settingsHeaderHoverForeground, + listHoverBackground: editorBackground, + listInactiveSelectionBackground: editorBackground, + listInactiveSelectionForeground: settingsHeaderForeground, + listInactiveFocusBackground: editorBackground, + listInactiveFocusOutline: editorBackground, + treeIndentGuidesStroke: undefined, + treeInactiveIndentGuidesStroke: undefined + }), + treeIndentGuidesStroke: undefined, + treeInactiveIndentGuidesStroke: undefined, + }); } }