prevent scm from moving on startup

sbatten · sbatten · commit 516bb5fd380e · 2020-06-09T09:36:55.000-07:00
diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts
@@ -122,7 +122,8 @@ export class CompositeDragAndDrop implements ICompositeDragAndDrop {
 			const draggedViews = this.viewDescriptorService.getViewContainerModel(currentContainer)!.allViewDescriptors;
 
 			// ... all views must be movable
-			return !draggedViews.some(v => !v.canMoveView);
+			// Prevent moving scm explicitly TODO@joaomoreno remove when scm is moveable
+			return !draggedViews.some(v => !v.canMoveView) && currentContainer.id !== 'workbench.view.scm';
 		} else {
 			// Dragging an individual view
 			const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(dragData.id);
diff --git a/src/vs/workbench/browser/parts/views/viewPaneContainer.ts b/src/vs/workbench/browser/parts/views/viewPaneContainer.ts
@@ -917,7 +917,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 						const container = this.viewDescriptorService.getViewContainerById(dropData.id)!;
 						const viewsToMove = this.viewDescriptorService.getViewContainerModel(container).allViewDescriptors;
 
-						if (!viewsToMove.some(v => !v.canMoveView)) {
+						if (!viewsToMove.some(v => !v.canMoveView) && viewsToMove.length > 0) {
 							overlay = new ViewPaneDropOverlay(parent, undefined, this.viewDescriptorService.getViewContainerLocation(this.viewContainer)!, this.themeService);
 						}
 					}
@@ -1357,7 +1357,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
 						const container = this.viewDescriptorService.getViewContainerById(dropData.id)!;
 						const viewsToMove = this.viewDescriptorService.getViewContainerModel(container).allViewDescriptors;
 
-						if (!viewsToMove.some(v => !v.canMoveView)) {
+						if (!viewsToMove.some(v => !v.canMoveView) && viewsToMove.length > 0) {
 							overlay = new ViewPaneDropOverlay(pane.dropTargetElement, this.orientation ?? Orientation.VERTICAL, this.viewDescriptorService.getViewContainerLocation(this.viewContainer)!, this.themeService);
 						}
 					}

Original file line number	Diff line number	Diff line change
`@@ -917,7 +917,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {`
`917`	`917`	`const container = this.viewDescriptorService.getViewContainerById(dropData.id)!;`
`918`	`918`	`const viewsToMove = this.viewDescriptorService.getViewContainerModel(container).allViewDescriptors;`
`919`	`919`
`920`		`- if (!viewsToMove.some(v => !v.canMoveView)) {`
	`920`	`+ if (!viewsToMove.some(v => !v.canMoveView) && viewsToMove.length > 0) {`
`921`	`921`	`overlay = new ViewPaneDropOverlay(parent, undefined, this.viewDescriptorService.getViewContainerLocation(this.viewContainer)!, this.themeService);`
`922`	`922`	`}`
`923`	`923`	`}`
`@@ -1357,7 +1357,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {`
`1357`	`1357`	`const container = this.viewDescriptorService.getViewContainerById(dropData.id)!;`
`1358`	`1358`	`const viewsToMove = this.viewDescriptorService.getViewContainerModel(container).allViewDescriptors;`
`1359`	`1359`
`1360`		`- if (!viewsToMove.some(v => !v.canMoveView)) {`
	`1360`	`+ if (!viewsToMove.some(v => !v.canMoveView) && viewsToMove.length > 0) {`
`1361`	`1361`	`overlay = new ViewPaneDropOverlay(pane.dropTargetElement, this.orientation ?? Orientation.VERTICAL, this.viewDescriptorService.getViewContainerLocation(this.viewContainer)!, this.themeService);`
`1362`	`1362`	`}`
`1363`	`1363`	`}`