From 963b5e425ec1e145fca2768460c672ee27cad09d Mon Sep 17 00:00:00 2001 From: SteVen Batten Date: Thu, 23 Apr 2020 14:08:07 -0700 Subject: [PATCH] icons and fixes for built-in panel moves --- src/vs/workbench/browser/parts/sidebar/sidebarPart.ts | 7 +------ .../workbench/contrib/debug/browser/debug.contribution.ts | 1 + .../contrib/markers/browser/markers.contribution.ts | 1 + .../contrib/output/browser/output.contribution.ts | 1 + .../contrib/terminal/browser/terminal.contribution.ts | 1 + .../services/views/browser/viewDescriptorService.ts | 3 +++ 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts index 4e943d60b4c..b3491779f56 100644 --- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts +++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts @@ -165,12 +165,7 @@ export class SidebarPart extends CompositePart implements IViewletServi const draggedItemProvider = (): { type: 'view' | 'composite', id: string } => { const activeViewlet = this.getActiveViewlet()!; - const visibleViews = activeViewlet.getViewPaneContainer().views.filter(v => v.isVisible()); - if (visibleViews.length === 1) { - return { type: 'view', id: visibleViews[0].id }; - } else { - return { type: 'composite', id: activeViewlet.getId() }; - } + return { type: 'composite', id: activeViewlet.getId() }; }; this._register(CompositeDragAndDropObserver.INSTANCE.registerDraggable(this.titleLabelElement!, draggedItemProvider, {})); diff --git a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts index 27ecb326cbd..b6255525c32 100644 --- a/src/vs/workbench/contrib/debug/browser/debug.contribution.ts +++ b/src/vs/workbench/contrib/debug/browser/debug.contribution.ts @@ -91,6 +91,7 @@ const openPanelKb: IKeybindings = { const VIEW_CONTAINER: ViewContainer = Registry.as(ViewExtensions.ViewContainersRegistry).registerViewContainer({ id: DEBUG_PANEL_ID, name: nls.localize({ comment: ['Debug is a noun in this context, not a verb.'], key: 'debugPanel' }, 'Debug Console'), + icon: 'codicon-debug-console', ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [DEBUG_PANEL_ID, { mergeViewWithContainerWhenSingleView: true, donotShowContainerTitleWhenMergedWithContainer: true }]), storageId: DEBUG_PANEL_ID, focusCommand: { diff --git a/src/vs/workbench/contrib/markers/browser/markers.contribution.ts b/src/vs/workbench/contrib/markers/browser/markers.contribution.ts index 5724d0eda4b..040dcdfcb94 100644 --- a/src/vs/workbench/contrib/markers/browser/markers.contribution.ts +++ b/src/vs/workbench/contrib/markers/browser/markers.contribution.ts @@ -113,6 +113,7 @@ class ToggleMarkersPanelAction extends ToggleViewAction { const VIEW_CONTAINER: ViewContainer = Registry.as(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({ id: Constants.MARKERS_CONTAINER_ID, name: Messages.MARKERS_PANEL_TITLE_PROBLEMS, + icon: Codicon.warning.classNames, hideIfEmpty: true, order: 0, ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [Constants.MARKERS_CONTAINER_ID, { mergeViewWithContainerWhenSingleView: true, donotShowContainerTitleWhenMergedWithContainer: true }]), diff --git a/src/vs/workbench/contrib/output/browser/output.contribution.ts b/src/vs/workbench/contrib/output/browser/output.contribution.ts index b128d30b4da..da7cd3b026c 100644 --- a/src/vs/workbench/contrib/output/browser/output.contribution.ts +++ b/src/vs/workbench/contrib/output/browser/output.contribution.ts @@ -62,6 +62,7 @@ const toggleOutputActionKeybindings = { const VIEW_CONTAINER: ViewContainer = Registry.as(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({ id: OUTPUT_VIEW_ID, name: nls.localize('output', "Output"), + icon: Codicon.output.classNames, order: 1, ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [OUTPUT_VIEW_ID, { mergeViewWithContainerWhenSingleView: true, donotShowContainerTitleWhenMergedWithContainer: true }]), storageId: OUTPUT_VIEW_ID, diff --git a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts index 26838725403..5b134f12fe5 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminal.contribution.ts @@ -68,6 +68,7 @@ if (platform.isWeb) { const VIEW_CONTAINER = Registry.as(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({ id: TERMINAL_VIEW_ID, name: nls.localize('terminal', "Terminal"), + icon: 'codicon-terminal', ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [TERMINAL_VIEW_ID, { mergeViewWithContainerWhenSingleView: true, donotShowContainerTitleWhenMergedWithContainer: true }]), storageId: TERMINAL_VIEW_ID, focusCommand: { id: TERMINAL_COMMAND_ID.FOCUS }, diff --git a/src/vs/workbench/services/views/browser/viewDescriptorService.ts b/src/vs/workbench/services/views/browser/viewDescriptorService.ts index 7cb5f4f7d58..d72ca7e1301 100644 --- a/src/vs/workbench/services/views/browser/viewDescriptorService.ts +++ b/src/vs/workbench/services/views/browser/viewDescriptorService.ts @@ -312,6 +312,9 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor this._onDidChangeContainerLocation.fire({ viewContainer, from, to }); + const views = this.getViewsByContainer(viewContainer); + this._onDidChangeLocation.fire({ views, from, to }); + this.saveViewContainerLocationsToCache(); } } -- GitLab