microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-06 05:56:09 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

CompositeBar: respect icon setting in CompositeActionItem

Browse Source 
fixes #36618
This commit is contained in:
isidor
2017-10-20 10:28:30 +02:00
parent 49f58653bd
commit bb74340d4c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/browser/parts/compositebar/compositeBar.ts
View File

@@ -327,7 +327,7 @@ export class CompositeBar implements ICompositeBar {
const compositeActivityAction = this.options.getActivityAction(compositeId);
const pinnedAction = this.options.getCompositePinnedAction(compositeId);
this.compositeIdToActionItems[compositeId] = this.instantiationService.createInstance(CompositeActionItem, compositeActivityAction, pinnedAction, this.options.colors, this);
this.compositeIdToActionItems[compositeId] = this.instantiationService.createInstance(CompositeActionItem, compositeActivityAction, pinnedAction, this.options.colors, this.options.icon, this);
this.compositeIdToActions[compositeId] = compositeActivityAction;
return compositeActivityAction;

3
src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts
View File

@@ -381,13 +381,14 @@ export class CompositeActionItem extends ActivityActionItem {
private compositeActivityAction: ActivityAction,
private toggleCompositePinnedAction: Action,
colors: ICompositeBarColors,
icon: boolean,
private compositeBar: ICompositeBar,
@IContextMenuService private contextMenuService: IContextMenuService,
@IKeybindingService private keybindingService: IKeybindingService,
@IInstantiationService instantiationService: IInstantiationService,
@IThemeService themeService: IThemeService
) {
super(compositeActivityAction, { draggable: true, colors }, themeService);
super(compositeActivityAction, { draggable: true, colors, icon }, themeService);
this.cssClass = compositeActivityAction.class;