From 53949d963f39e40757557c6526332354a31d9154 Mon Sep 17 00:00:00 2001 From: Miguel Solorio Date: Fri, 3 Aug 2018 10:38:35 -0700 Subject: [PATCH] Revert "Merge branch 'master' of github.com:Microsoft/vscode" This reverts commit bf46b6bfbae0cab99c2863e1244a916181fa9fbc, reversing changes made to e275a424483dfb4ed33b428c97d5e2c441d6b917. --- .../parts/preferences/browser/settingsTree.ts | 2 +- .../preferences/browser/settingsWidgets.ts | 20 +++++-------------- .../parts/preferences/browser/tocTree.ts | 2 +- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts index 8db86095977..15520d791e1 100644 --- a/src/vs/workbench/parts/preferences/browser/settingsTree.ts +++ b/src/vs/workbench/parts/preferences/browser/settingsTree.ts @@ -1468,7 +1468,7 @@ export class SettingsTree extends NonExpandableTree { controller, accessibilityProvider: instantiationService.createInstance(SettingsAccessibilityProvider), filter: instantiationService.createInstance(SettingsTreeFilter, viewState), - styler: new DefaultTreestyler(DOM.createStyleSheet(container), treeClass), + styler: new DefaultTreestyler(DOM.createStyleSheet(), treeClass), ...configuration }; diff --git a/src/vs/workbench/parts/preferences/browser/settingsWidgets.ts b/src/vs/workbench/parts/preferences/browser/settingsWidgets.ts index 16c7dc7ad40..ee1a2e61104 100644 --- a/src/vs/workbench/parts/preferences/browser/settingsWidgets.ts +++ b/src/vs/workbench/parts/preferences/browser/settingsWidgets.ts @@ -89,7 +89,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { const listSelectBackgroundColor = theme.getColor(listActiveSelectionBackground); if (listSelectBackgroundColor) { - collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row.selected:focus { background-color: ${listSelectBackgroundColor}; }`); + collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row:focus { background-color: ${listSelectBackgroundColor}; }`); } const listInactiveSelectionBackgroundColor = theme.getColor(listInactiveSelectionBackground); @@ -104,7 +104,7 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => { const listSelectForegroundColor = theme.getColor(listActiveSelectionForeground); if (listSelectForegroundColor) { - collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row.selected:focus { color: ${listSelectForegroundColor}; }`); + collector.addRule(`.settings-editor > .settings-body > .settings-tree-container .setting-item.setting-item-exclude .setting-exclude-row.selected { color: ${listSelectForegroundColor}; }`); } const codeTextForegroundColor = theme.getColor(textPreformatForeground); @@ -152,10 +152,6 @@ export class ExcludeSettingListModel { this._selectedIdx = idx; } - getSelected(): number { - return this._selectedIdx; - } - selectNext(): void { if (typeof this._selectedIdx === 'number') { this._selectedIdx = Math.min(this._selectedIdx + 1, this._dataItems.length - 1); @@ -210,18 +206,12 @@ export class ExcludeSettingWidget extends Disposable { return; } - const targetIdxStr = element.getAttribute('data-index'); - if (!targetIdxStr) { + const targetIdx = element.getAttribute('data-index'); + if (!targetIdx) { return; } - const targetIdx = parseInt(targetIdxStr); - - if (this.model.getSelected() === targetIdx) { - return; - } - - this.model.select(targetIdx); + this.model.select(parseInt(targetIdx)); this.renderList(); e.preventDefault(); e.stopPropagation(); diff --git a/src/vs/workbench/parts/preferences/browser/tocTree.ts b/src/vs/workbench/parts/preferences/browser/tocTree.ts index 3f1d29fdde6..f6d79fd69eb 100644 --- a/src/vs/workbench/parts/preferences/browser/tocTree.ts +++ b/src/vs/workbench/parts/preferences/browser/tocTree.ts @@ -169,7 +169,7 @@ export class TOCTree extends WorkbenchTree { const fullConfiguration = { controller: instantiationService.createInstance(WorkbenchTreeController, { openMode: OpenMode.DOUBLE_CLICK }), filter: instantiationService.createInstance(SettingsTreeFilter, viewState), - styler: new DefaultTreestyler(DOM.createStyleSheet(container), treeClass), + styler: new DefaultTreestyler(DOM.createStyleSheet(), treeClass), dataSource: instantiationService.createInstance(TOCDataSource), accessibilityProvider: instantiationService.createInstance(SettingsAccessibilityProvider),