maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix terminal stealing focus from the multistep quick pick.

Browse source 
This is a little weird. onDidFocus is based on a focus tracker,
but the focus() method is called when the terminal is actually expected
to take focus.
Fix #109538
This commit is contained in:
Rob Lourens 2020-10-27 17:47:14 -07:00
parent 949c3e089b
commit a9bbd0c09c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/workbench/contrib/terminal/browser/terminalView.ts
View file

@ -68,9 +68,6 @@ export class TerminalViewPane extends ViewPane {
this._onDidChangeViewWelcomeState.fire(); this._onDidChangeViewWelcomeState.fire();
}); });
this._register(this.onDidFocus(() => {
this._terminalService.getActiveTab()?.setWillFocus(true);
}));
this._register(this.onDidBlur(() => { this._register(this.onDidBlur(() => {
this._terminalService.getActiveTab()?.setWillFocus(false); this._terminalService.getActiveTab()?.setWillFocus(false);
})); }));
@ -219,6 +216,10 @@ export class TerminalViewPane extends ViewPane {
return super.getActionViewItem(action); return super.getActionViewItem(action);
} }
public focus() {
this._terminalService.getActiveTab()?.setWillFocus(true);
}
public focusFindWidget() { public focusFindWidget() {
const activeInstance = this._terminalService.getActiveInstance(); const activeInstance = this._terminalService.getActiveInstance();
if (activeInstance && activeInstance.hasSelection() && activeInstance.selection!.indexOf('\n') === -1) { if (activeInstance && activeInstance.hasSelection() && activeInstance.selection!.indexOf('\n') === -1) {