adopt custom view icon

sbatten · sbatten · commit 5d9108dd40fd · 2020-03-24T13:22:40.000-04:00
diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts
@@ -133,9 +133,7 @@ export class CompositeDragAndDrop implements ICompositeDragAndDrop {
 			}
 
 			// ... single view
-			const defaultContainer = this.viewDescriptorService.getDefaultContainer(draggedViews[0].id);
-			const canMoveToDefault = !!defaultContainer && this.viewDescriptorService.getViewContainerLocation(defaultContainer) === this.targetContainerLocation;
-			return !!draggedViews[0].canMoveView && (!!draggedViews[0].containerIcon || canMoveToDefault || this.targetContainerLocation === ViewContainerLocation.Panel);
+			return !!draggedViews[0].canMoveView;
 		} else {
 			// Dragging an individual view
 			const viewDescriptor = this.viewDescriptorService.getViewDescriptor(dragData.id);
@@ -146,7 +144,7 @@ export class CompositeDragAndDrop implements ICompositeDragAndDrop {
 			}
 
 			// ... to create a view container
-			return this.targetContainerLocation === ViewContainerLocation.Panel || !!viewDescriptor.containerIcon;
+			return true;
 		}
 	}
 }
diff --git a/src/vs/workbench/services/views/browser/viewDescriptorService.ts b/src/vs/workbench/services/views/browser/viewDescriptorService.ts
@@ -445,11 +445,7 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 	}
 
 	moveViewToLocation(view: IViewDescriptor, location: ViewContainerLocation): void {
-		let container = this.getDefaultContainer(view.id)!;
-		if (this.getViewContainerLocation(container) !== location) {
-			container = this.registerViewContainerForSingleView(view, location);
-		}
-
+		let container = this.registerViewContainerForSingleView(view, location);
 		this.moveViewsToContainer([view], container);
 	}
 
@@ -491,7 +487,7 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor
 			id,
 			ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [id, `${id}.state`, { mergeViewWithContainerWhenSingleView: true }]),
 			name: sourceView.name,
-			icon: sourceView.containerIcon,
+			icon: location === ViewContainerLocation.Sidebar ? sourceView.containerIcon || 'codicon-window' : undefined,
 			hideIfEmpty: true
 		}, location);
 	}

Original file line number	Diff line number	Diff line change
`@@ -133,9 +133,7 @@ export class CompositeDragAndDrop implements ICompositeDragAndDrop {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`// ... single view`
`136`		`- const defaultContainer = this.viewDescriptorService.getDefaultContainer(draggedViews[0].id);`
`137`		`- const canMoveToDefault = !!defaultContainer && this.viewDescriptorService.getViewContainerLocation(defaultContainer) === this.targetContainerLocation;`
`138`		`- return !!draggedViews[0].canMoveView && (!!draggedViews[0].containerIcon \|\| canMoveToDefault \|\| this.targetContainerLocation === ViewContainerLocation.Panel);`
	`136`	`+ return !!draggedViews[0].canMoveView;`
`139`	`137`	`} else {`
`140`	`138`	`// Dragging an individual view`
`141`	`139`	`const viewDescriptor = this.viewDescriptorService.getViewDescriptor(dragData.id);`
`@@ -146,7 +144,7 @@ export class CompositeDragAndDrop implements ICompositeDragAndDrop {`
`146`	`144`	`}`
`147`	`145`
`148`	`146`	`// ... to create a view container`
`149`		`- return this.targetContainerLocation === ViewContainerLocation.Panel \|\| !!viewDescriptor.containerIcon;`
	`147`	`+ return true;`
`150`	`148`	`}`
`151`	`149`	`}`
`152`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -445,11 +445,7 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor`
`445`	`445`	`}`
`446`	`446`
`447`	`447`	`moveViewToLocation(view: IViewDescriptor, location: ViewContainerLocation): void {`
`448`		`- let container = this.getDefaultContainer(view.id)!;`
`449`		`- if (this.getViewContainerLocation(container) !== location) {`
`450`		`- container = this.registerViewContainerForSingleView(view, location);`
`451`		`- }`
`452`		`-`
	`448`	`+ let container = this.registerViewContainerForSingleView(view, location);`
`453`	`449`	`this.moveViewsToContainer([view], container);`
`454`	`450`	`}`
`455`	`451`
`@@ -491,7 +487,7 @@ export class ViewDescriptorService extends Disposable implements IViewDescriptor`
`491`	`487`	`id,`
`492`	`488`	ctorDescriptor: new SyncDescriptor(ViewPaneContainer, [id, `${id}.state`, { mergeViewWithContainerWhenSingleView: true }]),
`493`	`489`	`name: sourceView.name,`
`494`		`- icon: sourceView.containerIcon,`
	`490`	`+ icon: location === ViewContainerLocation.Sidebar ? sourceView.containerIcon \|\| 'codicon-window' : undefined,`
`495`	`491`	`hideIfEmpty: true`
`496`	`492`	`}, location);`
`497`	`493`	`}`