From bb521643f5e43fea49cf81a39941c85a03aee87c Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 20 Dec 2018 17:16:59 +0100 Subject: [PATCH] fix scm viewlet --- .../parts/scm/electron-browser/scmViewlet.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts index afb796e2b90..926949b2902 100644 --- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts +++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts @@ -898,6 +898,7 @@ export class RepositoryPanel extends ViewletPanel { this.viewModel.onDidChangeVisibility(this.onDidChangeVisibility, this, this.disposables); this.onDidChangeVisibility(this.viewModel.isVisible()); + this.onDidChangeBodyVisibility(visible => this.inputBox.setEnabled(visible)); } private onDidChangeVisibility(visible: boolean): void { @@ -907,15 +908,6 @@ export class RepositoryPanel extends ViewletPanel { } else { this.visibilityDisposables = dispose(this.visibilityDisposables); } - - this.inputBox.setEnabled(this.isBodyVisible()); - } - - setExpanded(expanded: boolean): boolean { - const changed = super.setExpanded(expanded); - this.inputBox.setEnabled(this.isBodyVisible()); - - return changed; } layoutBody(height: number = this.cachedHeight): void { @@ -1214,6 +1206,8 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle const panel = this.panels[start + i] as ViewletPanel; panel.setVisible(visible); } + + this.repositoryPanels.forEach(panel => panel.setVisible(visible)); } getOptimalWidth(): number { @@ -1297,6 +1291,7 @@ export class SCMViewlet extends PanelViewlet implements IViewModel, IViewsViewle .map((r, index) => { const panel = this.instantiationService.createInstance(RepositoryPanel, `scm.repository.${r.provider.label}.${index}`, r, this); panel.render(); + panel.setVisible(true); return panel; }); -- GitLab