From 2a77a2f7a5d596b2903ff91f4ebb23ceb3d3ce56 Mon Sep 17 00:00:00 2001 From: Alex Ross Date: Wed, 16 Sep 2020 15:23:04 +0200 Subject: [PATCH] Don't update title area for filterview (#106775) Fixes microsoft/vscode-remote-release#3676 --- src/vs/workbench/browser/viewlet.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts index 5cdb3864c88..01ef1665c2d 100644 --- a/src/vs/workbench/browser/viewlet.ts +++ b/src/vs/workbench/browser/viewlet.ts @@ -27,6 +27,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { PaneComposite } from 'vs/workbench/browser/panecomposite'; import { Event } from 'vs/base/common/event'; +import { FilterViewPaneContainer } from 'vs/workbench/browser/parts/views/viewsViewlet'; export abstract class Viewlet extends PaneComposite implements IViewlet { @@ -43,10 +44,13 @@ export abstract class Viewlet extends PaneComposite implements IViewlet { @IConfigurationService protected configurationService: IConfigurationService ) { super(id, viewPaneContainer, telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService); - this._register(Event.any(viewPaneContainer.onDidAddViews, viewPaneContainer.onDidRemoveViews, viewPaneContainer.onTitleAreaUpdate)(() => { - // Update title area since there is no better way to update secondary actions - this.updateTitleArea(); - })); + // Only updateTitleArea for non-filter views: microsoft/vscode-remote-release#3676 + if (!(viewPaneContainer instanceof FilterViewPaneContainer)) { + this._register(Event.any(viewPaneContainer.onDidAddViews, viewPaneContainer.onDidRemoveViews, viewPaneContainer.onTitleAreaUpdate)(() => { + // Update title area since there is no better way to update secondary actions + this.updateTitleArea(); + })); + } } getContextMenuActions(): IAction[] {