From 1aa2027491bd7bd81da27f9e6978b9696169403d Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Thu, 23 Jun 2016 15:34:14 +0200 Subject: [PATCH] one actionBarContributor for now --- .../browser/parts/editor/noTabsTitleControl.ts | 1 + .../browser/parts/editor/tabsTitleControl.ts | 1 + src/vs/workbench/browser/parts/editor/titleControl.ts | 11 +++++++---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts index 499a30b1c88..78a195821ad 100644 --- a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts @@ -56,6 +56,7 @@ export class NoTabsTitleControl extends TitleControl { } public create(parent: HTMLElement): void { + super.create(parent); this.titleContainer = parent; // Pin on double click diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index 8dded89ab7b..76a3f324a56 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -71,6 +71,7 @@ export class TabsTitleControl extends TitleControl { } public create(parent: HTMLElement): void { + super.create(parent); this.titleContainer = parent; // Tabs Container diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts index 88bf545413f..c76d80e004f 100644 --- a/src/vs/workbench/browser/parts/editor/titleControl.ts +++ b/src/vs/workbench/browser/parts/editor/titleControl.ts @@ -50,7 +50,7 @@ export interface ITitleAreaControl { dispose(): void; } -export abstract class TitleControl { +export abstract class TitleControl implements ITitleAreaControl { private static draggedEditor: IEditorIdentifier; @@ -98,8 +98,6 @@ export abstract class TitleControl { this.toDispose.push(this.scheduler); this.resourceContext = instantiationService.createInstance(ResourceContextKey); - this.titleActionBarContributor = instantiationService.createInstance(ActionBarContributor, MenuLocation.EditorPrimary); - this.toDispose.push(this.titleActionBarContributor); this.initActions(); this.registerListeners(); @@ -120,7 +118,6 @@ export abstract class TitleControl { private registerListeners(): void { this.toDispose.push(this.configurationService.onDidUpdateConfiguration(e => this.onConfigurationUpdated(e.config))); this.toDispose.push(this.stacks.onModelChanged(e => this.onStacksChanged(e))); - this.toDispose.push(this.titleActionBarContributor.onDidUpdate(e => this.refresh())); } private onStacksChanged(e: IStacksModelChangeEvent): void { @@ -179,6 +176,12 @@ export abstract class TitleControl { } } + public create(parent: HTMLElement): void { + this.titleActionBarContributor = this.instantiationService.createInstance(ActionBarContributor, parent, MenuLocation.EditorPrimary); + this.toDispose.push(this.titleActionBarContributor.onDidUpdate(e => this.refresh())); + this.toDispose.push(this.titleActionBarContributor); + } + protected abstract doRefresh(): void; protected doUpdate(): void { -- GitLab