From bb74340d4cf5982ce81fc7911e5efa45415fdff2 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 20 Oct 2017 10:28:30 +0200 Subject: [PATCH] CompositeBar: respect icon setting in CompositeActionItem fixes #36618 --- src/vs/workbench/browser/parts/compositebar/compositeBar.ts | 2 +- .../browser/parts/compositebar/compositeBarActions.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts index 6f0ca9a6f33..3b3a8c1570a 100644 --- a/src/vs/workbench/browser/parts/compositebar/compositeBar.ts +++ b/src/vs/workbench/browser/parts/compositebar/compositeBar.ts @@ -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; diff --git a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts index 415f8c9daa1..5971250d6ff 100644 --- a/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts +++ b/src/vs/workbench/browser/parts/compositebar/compositeBarActions.ts @@ -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;