From 24f2bef99e2d5940569eafd2fc02b5644a1a2200 Mon Sep 17 00:00:00 2001 From: BeniBenj Date: Fri, 15 Mar 2024 08:33:10 +0100 Subject: [PATCH] fix registering menu twice on web --- .../browser/parts/sidebar/sidebarPart.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts index ec8b45519fb47..a784caf2e0f8f 100644 --- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts +++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts @@ -112,13 +112,19 @@ export class SidebarPart extends AbstractPaneCompositePart { } private onDidChangeActivityBarLocation(): void { + this.acitivityBarPart.hide(); + this.updateCompositeBar(); const id = this.getActiveComposite()?.getId(); if (id) { this.onTitleAreaUpdate(id); } - this.updateActivityBarVisiblity(); + + if (this.shouldShowActivityBar()) { + this.acitivityBarPart.show(); + } + this.rememberActivityBarVisiblePosition(); } @@ -233,14 +239,6 @@ export class SidebarPart extends AbstractPaneCompositePart { } } - private updateActivityBarVisiblity(): void { - if (this.shouldShowActivityBar()) { - this.acitivityBarPart.show(); - } else { - this.acitivityBarPart.hide(); - } - } - override getPinnedPaneCompositeIds(): string[] { return this.shouldShowCompositeBar() ? super.getPinnedPaneCompositeIds() : this.acitivityBarPart.getPinnedPaneCompositeIds(); }