From e96e70d59ef5eebed0b44d2d628c96b1605ea8c8 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Mon, 29 Mar 2021 10:26:44 +0200 Subject: [PATCH] remove overflow action when there are no overflows --- src/vs/workbench/browser/parts/compositeBar.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts index 2ff5f5e37a2..78d88f18f2f 100644 --- a/src/vs/workbench/browser/parts/compositeBar.ts +++ b/src/vs/workbench/browser/parts/compositeBar.ts @@ -6,7 +6,6 @@ import { localize } from 'vs/nls'; import { IAction, toAction } from 'vs/base/common/actions'; import { illegalArgument } from 'vs/base/common/errors'; -import { equals } from 'vs/base/common/arrays'; import { IDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { IBadge } from 'vs/workbench/services/activity/common/activity'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -536,10 +535,8 @@ export class CompositeBar extends Widget implements ICompositeBar { compositesToShow.length ? compositesToShow.splice(compositesToShow.length - 2, 1) : compositesToShow.pop(); } - const visibleCompositesChange = !equals(compositesToShow, this.visibleComposites); - - // Pull out overflow action if there is a composite change so that we can add it to the end later - if (this.compositeOverflowAction && visibleCompositesChange) { + // Remove the overflow action if there are no overflows + if (!overflows && this.compositeOverflowAction) { compositeSwitcherBar.pull(compositeSwitcherBar.length() - 1); this.compositeOverflowAction.dispose();