From a7674d53536ba098107994d6ca7b145d230e6ef0 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Wed, 27 Jun 2018 17:06:06 -0700 Subject: [PATCH] Fix #53122 - don't focus the settings tree when navigating in the settings editor TOC --- .../parts/preferences/browser/settingsEditor2.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts index f973c023821..30adbcb795b 100644 --- a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts +++ b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts @@ -272,18 +272,16 @@ export class SettingsEditor2 extends BaseEditor { twistiePixels: 15 }); - this._register(this.tocTree.onDidChangeSelection(e => { + this._register(this.tocTree.onDidChangeFocus(e => { + const element = e.focus; if (this.searchResultModel) { - const element = e.selection[0]; this.viewState.filterToCategory = element; this.refreshTreeAndMaintainFocus(); } else if (this.settingsTreeModel) { - const element = e.selection[0]; if (element && !e.payload.fromScroll) { this.settingsTree.reveal(element, 0); this.settingsTree.setSelection([element]); this.settingsTree.setFocus(element); - this.settingsTree.domFocus(); } } })); @@ -452,8 +450,8 @@ export class SettingsEditor2 extends BaseEditor { this.tocTree.reveal(element, 1); } - this.tocTree.setSelection([element], { fromScroll: true }); - this.tocTree.setFocus(element); + this.tocTree.setSelection([element]); + this.tocTree.setFocus(element, { fromScroll: true }); } } -- GitLab