scm container fixes

microsoft · Jun 26, 2020 · 3158fc0 · 3158fc0
1 parent 4c28fbf
commit 3158fc0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts
@@ -122,8 +122,7 @@ export class CompositeDragAndDrop implements ICompositeDragAndDrop {
 			const draggedViews = this.viewDescriptorService.getViewContainerModel(currentContainer)!.allViewDescriptors;
 
 			// ... all views must be movable
-			// Prevent moving scm explicitly TODO@joaomoreno remove when scm is moveable
-			return !draggedViews.some(v => !v.canMoveView) && currentContainer.id !== 'workbench.view.scm';
+			return !draggedViews.some(v => !v.canMoveView);
 		} else {
 			// Dragging an individual view
 			const viewDescriptor = this.viewDescriptorService.getViewDescriptorById(dragData.id);

diff --git a/src/vs/workbench/contrib/scm/browser/scm.contribution.ts b/src/vs/workbench/contrib/scm/browser/scm.contribution.ts
@@ -56,7 +56,8 @@ const viewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensio
 	storageId: 'workbench.scm.views.state',
 	icon: Codicon.sourceControl.classNames,
 	alwaysUseContainerInfo: true,
-	order: 2
+	order: 2,
+	hideIfEmpty: true
 }, ViewContainerLocation.Sidebar);
 
 const viewsRegistry = Registry.as<IViewsRegistry>(ViewContainerExtensions.ViewsRegistry);