From cc95494567cfededb9bd28ebf035fd5c384b3a8d Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 23 Sep 2016 15:59:45 +0200 Subject: [PATCH] always show toggle panel action in activity bar --- .../workbench/browser/parts/activitybar/activitybarPart.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts index 29c3c14be43..470ae13016b 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts @@ -37,7 +37,7 @@ export class ActivitybarPart extends Part implements IActivityService { private panelSwitcherBar: ActionBar; private activityActionItems: { [actionId: string]: IActionItem; }; private compositeIdToActions: { [compositeId: string]: ActivityAction; }; - private panelActions: Action[]; + private panelActions: ActivityAction[]; private showPanelAction: TogglePanelAction; constructor( @@ -158,7 +158,10 @@ export class ActivitybarPart extends Part implements IActivityService { private updatePanelSwitcher(): void { this.panelSwitcherBar.clear(); - const actions = this.partService.isPanelHidden() ? this.showPanelAction : this.panelActions; + const actions:ActivityAction[] = [this.showPanelAction]; + if (!this.partService.isPanelHidden()) { + actions.push(...this.panelActions); + } this.panelSwitcherBar.push(actions, { label: true, icon: true }); }