From 26cdf6a825b76f67dda091e1994c15216ecda4fe Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 14 Jul 2016 15:59:00 +0200 Subject: [PATCH] group actions => editor actions --- .../browser/parts/editor/media/tabstitle.css | 4 ++-- .../parts/editor/media/titlecontrol.css | 6 ++--- .../browser/parts/editor/tabsTitleControl.ts | 22 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/vs/workbench/browser/parts/editor/media/tabstitle.css b/src/vs/workbench/browser/parts/editor/media/tabstitle.css index 51bc926ca30..0e401e46d10 100644 --- a/src/vs/workbench/browser/parts/editor/media/tabstitle.css +++ b/src/vs/workbench/browser/parts/editor/media/tabstitle.css @@ -205,9 +205,9 @@ background: url('close-inverse.svg') center center no-repeat; } -/* Group Actions */ +/* Editor Actions */ -.monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title .group-actions { +.monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title .editor-actions { flex: initial; padding-left: 4px; } \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css index db4e8118201..d1982cc0fde 100644 --- a/src/vs/workbench/browser/parts/editor/media/titlecontrol.css +++ b/src/vs/workbench/browser/parts/editor/media/titlecontrol.css @@ -51,7 +51,7 @@ /* Title Actions */ .monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title .title-actions .action-label, -.monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title .group-actions .action-label { +.monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title .editor-actions .action-label { display: block; height: 35px; line-height: 35px; @@ -62,11 +62,11 @@ } .hc-black .monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title .title-actions .action-label, -.hc-black .monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title .group-actions .action-label { +.hc-black .monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title .editor-actions .action-label { line-height: initial; } -.monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title .group-actions .action-label .label, +.monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title .editor-actions .action-label .label, .monaco-workbench > .part.editor > .content > .one-editor-silo > .container > .title .title-actions .action-label .label { display: none; } diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index 1696d461675..d076e6c8cf7 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -43,7 +43,7 @@ export class TabsTitleControl extends TitleControl { private activeTab: HTMLElement; private scrollbar: ScrollableElement; - private groupActionsToolbar: ToolBar; + private editorActionsToolbar: ToolBar; private tabDisposeables: IDisposable[] = []; private currentPrimaryGroupActionIds: string[] = []; @@ -73,7 +73,7 @@ export class TabsTitleControl extends TitleControl { public setContext(group: IEditorGroup): void { super.setContext(group); - this.groupActionsToolbar.context = { group }; + this.editorActionsToolbar.context = { group }; } public create(parent: HTMLElement): void { @@ -160,11 +160,11 @@ export class TabsTitleControl extends TitleControl { } })); - // Group Actions - const groupActionsContainer = document.createElement('div'); - DOM.addClass(groupActionsContainer, 'group-actions'); - this.titleContainer.appendChild(groupActionsContainer); - this.groupActionsToolbar = this.doCreateToolbar(groupActionsContainer); + // Editor Actions + const editorActionsContainer = document.createElement('div'); + DOM.addClass(editorActionsContainer, 'editor-actions'); + this.titleContainer.appendChild(editorActionsContainer); + this.editorActionsToolbar = this.doCreateToolbar(editorActionsContainer); } public allowDragging(element: HTMLElement): boolean { @@ -220,7 +220,7 @@ export class TabsTitleControl extends TitleControl { } }); - // Update Group Actions Toolbar + // Update Editor Actions Toolbar const groupActions = this.getGroupActions(group); const primaryGroupActions = groupActions.primary; const secondaryGroupActions = groupActions.secondary; @@ -228,7 +228,7 @@ export class TabsTitleControl extends TitleControl { const secondaryGroupActionIds = secondaryGroupActions.map(a => a.id); if (!arrays.equals(primaryGroupActionIds, this.currentPrimaryGroupActionIds) || !arrays.equals(secondaryGroupActionIds, this.currentSecondaryGroupActionIds)) { - this.groupActionsToolbar.setActions(primaryGroupActions, secondaryGroupActions)(); + this.editorActionsToolbar.setActions(primaryGroupActions, secondaryGroupActions)(); this.currentPrimaryGroupActionIds = primaryGroupActionIds; this.currentSecondaryGroupActionIds = secondaryGroupActionIds; } @@ -243,7 +243,7 @@ export class TabsTitleControl extends TitleControl { if (!editor) { this.clearTabs(); - this.groupActionsToolbar.setActions([], [])(); + this.editorActionsToolbar.setActions([], [])(); this.currentPrimaryGroupActionIds = []; this.currentSecondaryGroupActionIds = []; @@ -555,6 +555,6 @@ export class TabsTitleControl extends TitleControl { super.dispose(); // Toolbar - this.groupActionsToolbar.dispose(); + this.editorActionsToolbar.dispose(); } } \ No newline at end of file