Settings editor - don't blink the scrollbar when toc selection changes

roblourens · roblourens · commit bd262c9ab553 · 2018-07-29T19:09:17.000-07:00
And hide TOC correctly when the editor is narrow
diff --git a/src/vs/base/parts/tree/browser/treeUtils.ts b/src/vs/base/parts/tree/browser/treeUtils.ts
@@ -6,14 +6,28 @@
 
 import * as _ from 'vs/base/parts/tree/browser/tree';
 
-export function collapseAll(tree: _.ITree): void {
+export function collapseAll(tree: _.ITree, except?: any): void {
 	const nav = tree.getNavigator();
 	let cur;
 	while (cur = nav.next()) {
-		tree.collapse(cur);
+		if (!except || !isEqualOrParent(tree, except, cur)) {
+			tree.collapse(cur);
+		}
 	}
 }
 
+export function isEqualOrParent(tree: _.ITree, element: any, candidateParent: any): boolean {
+	const nav = tree.getNavigator(element);
+
+	do {
+		if (element === candidateParent) {
+			return true;
+		}
+	} while (element = nav.parent());
+
+	return false;
+}
+
 export function expandAll(tree: _.ITree): void {
 	const nav = tree.getNavigator();
 	let cur;
diff --git a/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css b/src/vs/workbench/parts/preferences/browser/media/settingsEditor2.css
@@ -133,7 +133,6 @@
 	display: flex;
 	margin: auto;
 	max-width: 1000px;
-	justify-content: space-between;
 }
 
 .settings-editor.search-mode > .settings-body .settings-tree-container .monaco-tree-wrapper,
@@ -142,14 +141,19 @@
 	margin-left: 0px;
 }
 
+.settings-editor.narrow > .settings-body .settings-tree-container .monaco-tree-wrapper,
+.settings-editor.narrow > .settings-body > .settings-tree-container .setting-measure-container {
+	width: calc(100% - 11px);
+	margin-left: 0px;
+}
+
 .settings-editor > .settings-body .settings-tree-container .monaco-tree-wrapper,
 .settings-editor > .settings-body > .settings-tree-container .setting-measure-container {
 	/** 11px for scrollbar + 208px for TOC margin */
 	width: calc(100% - 219px);
 	margin-left: 208px;
 }
 
-
 .settings-editor > .settings-body .settings-toc-container {
 	position: absolute;
 	width: 160px;
diff --git a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
@@ -437,11 +437,9 @@ export class SettingsEditor2 extends BaseEditor {
 		if (element && this.tocTree.getSelection()[0] !== element) {
 			this.tocTree.reveal(element);
 			const elementTop = this.tocTree.getRelativeTop(element);
-			collapseAll(this.tocTree);
-			if (elementTop < 0) {
-				this.tocTree.reveal(element, 0);
-			} else if (elementTop > 1) {
-				this.tocTree.reveal(element, 1);
+			collapseAll(this.tocTree, element);
+			if (elementTop < 0 || elementTop > 1) {
+				this.tocTree.reveal(element);
 			} else {
 				this.tocTree.reveal(element, elementTop);
 			}
