From 18ab4c42aaa7f651beddadbdfe575ca21396866d Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Mon, 25 Sep 2017 12:07:08 +0200 Subject: [PATCH] fix size restore issue in extensions viewlet --- src/vs/workbench/browser/parts/views/viewsViewlet.ts | 3 ++- .../extensions/electron-browser/extensionsViewlet.ts | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/browser/parts/views/viewsViewlet.ts b/src/vs/workbench/browser/parts/views/viewsViewlet.ts index 18e44ef1ae6..0191e434b4c 100644 --- a/src/vs/workbench/browser/parts/views/viewsViewlet.ts +++ b/src/vs/workbench/browser/parts/views/viewsViewlet.ts @@ -414,7 +414,8 @@ export class ViewsViewlet extends PanelViewlet { }); toCreate.push(view); - this.addPanel(view, viewState ? viewState.size : 200, index); + const size = viewState ? viewState.size : (viewDescriptor.size || 200); + this.addPanel(view, size, index); this.viewsViewletPanels.splice(index, 0, view); } diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts index 13596120ac9..ccbee9dd3a1 100644 --- a/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts +++ b/src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts @@ -136,7 +136,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens name: localize('marketPlace', "Marketplace"), location: ViewLocation.Extensions, ctor: ExtensionsListView, - when: ContextKeyExpr.and(ContextKeyExpr.has('extensionsViewletVisible'), ContextKeyExpr.has('searchExtensions'), ContextKeyExpr.not('searchInstalledExtensions')), + when: ContextKeyExpr.and(ContextKeyExpr.has('searchExtensions'), ContextKeyExpr.not('searchInstalledExtensions')), size: 100 }; } @@ -147,7 +147,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens name: localize('installedExtensions', "Installed"), location: ViewLocation.Extensions, ctor: InstalledExtensionsView, - when: ContextKeyExpr.and(ContextKeyExpr.has('extensionsViewletVisible'), ContextKeyExpr.not('searchExtensions')), + when: ContextKeyExpr.and(ContextKeyExpr.not('searchExtensions')), size: 50 }; } @@ -158,7 +158,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens name: localize('searchInstalledExtensions', "Installed"), location: ViewLocation.Extensions, ctor: InstalledExtensionsView, - when: ContextKeyExpr.and(ContextKeyExpr.has('extensionsViewletVisible'), ContextKeyExpr.has('searchInstalledExtensions')), + when: ContextKeyExpr.and(ContextKeyExpr.has('searchInstalledExtensions')), size: 50 }; } @@ -169,7 +169,7 @@ export class ExtensionsViewlet extends PersistentViewsViewlet implements IExtens name: localize('recommendedExtensions', "Recommended"), location: ViewLocation.Extensions, ctor: RecommendedExtensionsView, - when: ContextKeyExpr.and(ContextKeyExpr.has('extensionsViewletVisible'), ContextKeyExpr.not('searchExtensions')), + when: ContextKeyExpr.and(ContextKeyExpr.not('searchExtensions')), size: 50, canToggleVisibility: true }; -- GitLab