Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Settings should not show indent guides. Simple fix #171809

Merged
merged 1 commit into from Jan 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 21 additions & 17 deletions src/vs/workbench/contrib/preferences/browser/settingsTree.ts
Expand Up @@ -2281,23 +2281,27 @@ export class SettingsTree extends WorkbenchObjectTree<SettingsTreeElement> {

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')) {
Expand Down
38 changes: 22 additions & 16 deletions src/vs/workbench/contrib/preferences/browser/tocTree.ts
Expand Up @@ -231,21 +231,27 @@ export class TOCTree extends WorkbenchObjectTree<SettingsTreeGroupElement> {
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,
});
}
}