Fix microsoft#69297 - settings editor dropdown issues

Ubuntu · Ubuntu · commit d59d014ece9b · 2019-03-07T00:53:44.000Z
diff --git a/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts b/src/vs/base/browser/ui/selectBox/selectBoxCustom.ts
@@ -419,6 +419,7 @@ export class SelectBoxList implements ISelectBoxDelegate, IListVirtualDelegate<I
 	// ContextView dropdown methods
 
 	private showSelectDropDown() {
+		this.selectionDetailsPane.innerText = '';
 
 		if (!this.contextViewProvider || this._isVisible) {
 			return;
@@ -568,7 +569,8 @@ export class SelectBoxList implements ISelectBoxDelegate, IListVirtualDelegate<I
 
 			this.selectDropDownContainer.style.width = selectOptimalWidth;
 
-			// Get initial list height and determine space ab1you knowove and below
+			// Get initial list height and determine space above and below
+			this.selectList.getHTMLElement().style.height = '';
 			this.selectList.layout();
 			let listHeight = this.selectList.contentHeight;
 
@@ -667,6 +669,7 @@ export class SelectBoxList implements ISelectBoxDelegate, IListVirtualDelegate<I
 			if (this._hasDetails) {
 				// Leave the selectDropDownContainer to size itself according to children (list + details) - #57447
 				this.selectList.getHTMLElement().style.height = (listHeight + verticalPadding) + 'px';
+				this.selectDropDownContainer.style.height = '';
 			} else {
 				this.selectDropDownContainer.style.height = (listHeight + verticalPadding) + 'px';
 			}
diff --git a/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts b/src/vs/workbench/contrib/preferences/electron-browser/settingsEditor2.ts
@@ -940,6 +940,12 @@ export class SettingsEditor2 extends BaseEditor {
 			return Promise.resolve(undefined);
 		}
 
+		// If the context view is focused, delay rendering settings
+		if (this.contextViewFocused()) {
+			this.scheduleRefresh(document.querySelector('.context-view'), key);
+			return Promise.resolve(undefined);
+		}
+
 		// If a setting control is currently focused, schedule a refresh for later
 		const activeElement = this.getActiveElementInSettingsTree();
 		const focusedSetting = activeElement && this.settingRenderers.getSettingDOMElementForDOMElement(activeElement);
@@ -980,6 +986,10 @@ export class SettingsEditor2 extends BaseEditor {
 		return Promise.resolve(undefined);
 	}
 
+	private contextViewFocused(): boolean {
+		return !!DOM.findParentWithClass(<HTMLElement>document.activeElement, 'context-view');
+	}
+
 	private refreshTree(): void {
 		if (this.isVisible()) {
 			this.settingsTree.setChildren(null, createGroupIterator(this.currentSettingsModel.root));
