Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

group actions => editor actions

Browse Source
This commit is contained in:
Benjamin Pasero
2016-07-14 15:59:00 +02:00
parent 6987814fb5
commit 26cdf6a825
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/browser/parts/editor/media/tabstitle.css
+2 -2
View File
@@ -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;
}
src/vs/workbench/browser/parts/editor/media/titlecontrol.css
+3 -3
View File
@@ -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;
}
src/vs/workbench/browser/parts/editor/tabsTitleControl.ts
+11 -11
View File
@@ -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();
}
}