diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts index af8ce70f5ad..fc7da781979 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -354,12 +354,10 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi } }; - // Maybe maximize auxiliary bar when no editors, sidebar hidden, and panel hidden + // Maybe maximize auxiliary bar when no editors are visible const maybeMaximizeAuxiliaryBar = () => { if ( this.mainPartEditorService.visibleEditors.length === 0 && - !this.isVisible(Parts.SIDEBAR_PART) && - !this.isVisible(Parts.PANEL_PART) && this.configurationService.getValue(WorkbenchLayoutSettings.AUXILIARYBAR_FORCE_MAXIMIZED) === true ) { this.setAuxiliaryBarMaximized(true); @@ -383,13 +381,6 @@ export abstract class Layout extends Disposable implements IWorkbenchLayoutServi })); this._register(this.editorGroupService.mainPart.onDidActivateGroup(showEditorIfHidden)); - // Maybe maximize auxiliary bar when sidebar or panel hides - this._register(this.onDidChangePartVisibility(({ partId, visible }) => { - if (!visible && (partId === Parts.SIDEBAR_PART || partId === Parts.PANEL_PART)) { - maybeMaximizeAuxiliaryBar(); - } - })); - // Revalidate center layout when active editor changes: diff editor quits centered mode this._register(this.mainPartEditorService.onDidActiveEditorChange(() => this.centerMainEditorLayout(this.stateModel.getRuntimeValue(LayoutStateKeys.MAIN_EDITOR_CENTERED)))); }); diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts index a1e90803d5a..5ea32fb1a11 100644 --- a/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts @@ -589,7 +589,7 @@ const registry = Registry.as(ConfigurationExtensions.Con 'type': 'boolean', 'default': false, tags: ['experimental'], - 'description': localize('secondarySideBarForceMaximized', "Controls whether the secondary side bar is enforced to always show maximized unless other parts or editors are showing."), + 'description': localize('secondarySideBarForceMaximized', "Controls whether the secondary side bar is enforced to always show maximized on startup and when there are no open editors, in layouts that support a maximized secondary side bar."), }, 'workbench.secondarySideBar.showLabels': { 'type': 'boolean',