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

🧹

Browse source
This commit is contained in:
meganrogge 2021-05-13 09:46:07 -07:00
parent 9bc642fa22
commit a9c444a605
No known key found for this signature in database
GPG key ID: 3155C8B2F0428C81
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@ import { getColorForSeverity } from 'vs/workbench/contrib/terminal/browser/termi
import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
import { TerminalTabContextMenuGroup } from 'vs/workbench/contrib/terminal/browser/terminalMenus';
import { DropdownWithPrimaryActionViewItem } from 'vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
export class TerminalViewPane extends ViewPane {
private _actions: IAction[] | undefined;
@ -345,7 +346,7 @@ function getTerminalSelectOpenItems(terminalService: ITerminalService): ISelectO
class SingleTerminalTabActionViewItem extends ActionViewItem {
private _color: string | undefined;
private _initializedListener: boolean = false;
private _contextMenuListener: IDisposable | undefined;
constructor(
action: IAction,
private readonly _actions: IAction[],
@ -371,13 +372,16 @@ class SingleTerminalTabActionViewItem extends ActionViewItem {
this.updateLabel();
}
}));
this._register(toDisposable(() => this._contextMenuListener?.dispose()));
}
override updateLabel(): void {
if (!this._initializedListener) {
// makes sure this.element is defined
this._initListener();
this._initializedListener = true;
if (!this._contextMenuListener) {
this._contextMenuListener = dom.addDisposableListener(this.element!, dom.EventType.CONTEXT_MENU, (e: MouseEvent) => {
if (e.button === 2) {
this._run();
}
});
}
if (this.label) {
const label = this.label;
@ -417,14 +421,6 @@ class SingleTerminalTabActionViewItem extends ActionViewItem {
getActionsContext: () => this.label
});
}
private _initListener(): void {
this._register(dom.addDisposableListener(this.element!, dom.EventType.CONTEXT_MENU, (e: MouseEvent) => {
if (e.button === 2) {
this._run();
}
}));
}
}
function getSingleTabLabel(instance: ITerminalInstance | null) {