diff --git a/src/vs/workbench/browser/parts/editor/titleControl.ts b/src/vs/workbench/browser/parts/editor/titleControl.ts index 6c7ff173d301fb04ca7d3e4553a5357b443c71a4..8dd9895bcc0416b66195f6687d7482dd978d0344 100644 --- a/src/vs/workbench/browser/parts/editor/titleControl.ts +++ b/src/vs/workbench/browser/parts/editor/titleControl.ts @@ -53,6 +53,8 @@ export interface ITitleAreaControl { dispose(): void; } +const showTabsOverflowAction = false; // TODO@Ben temporary + export abstract class TitleControl implements ITitleAreaControl { private static draggedEditor: IEditorIdentifier; @@ -226,6 +228,8 @@ export abstract class TitleControl implements ITitleAreaControl { this.pinEditorAction = this.instantiationService.createInstance(KeepEditorAction, KeepEditorAction.ID, nls.localize('keepOpen', "Keep Open")); this.showEditorsInGroupAction = this.instantiationService.createInstance(ShowEditorsInGroupAction, ShowEditorsInGroupAction.ID, nls.localize('showOpenedEditors', "Show Opened Editors")); this.splitEditorAction = this.instantiationService.createInstance(SplitEditorAction, SplitEditorAction.ID, SplitEditorAction.LABEL); + + this.showEditorsInGroupAction.class = 'show-group-editors-action'; } protected createEditorActionsToolBar(container: HTMLElement): void { @@ -367,9 +371,15 @@ export abstract class TitleControl implements ITitleAreaControl { secondaryEditorActions = prepareActions(editorActions.secondary); } + if (this.showTabs && showTabsOverflowAction) { + primaryEditorActions.push(this.showEditorsInGroupAction); + } + if (this.showTabs) { - secondaryEditorActions.push(new Separator()); - secondaryEditorActions.push(this.showEditorsInGroupAction); + if (!showTabsOverflowAction) { + secondaryEditorActions.push(new Separator()); + secondaryEditorActions.push(this.showEditorsInGroupAction); + } secondaryEditorActions.push(new Separator()); secondaryEditorActions.push(this.closeEditorsInGroupAction); }