From e1acce1342ded4aa579ce247c2680917233fd10e Mon Sep 17 00:00:00 2001
From: Benjamin Pasero <benjpas@microsoft.com>
Date: Mon, 20 Mar 2017 11:41:08 -0700
Subject: [PATCH] theming - workbench drop overlay

---
 .../electron-browser/media/shell.css          |  2 +-
 .../electron-browser/media/workbench.css      | 20 +------------------
 src/vs/workbench/electron-browser/window.ts   | 20 ++++++++++++++++---
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/vs/workbench/electron-browser/media/shell.css b/src/vs/workbench/electron-browser/media/shell.css
index 661d8dac11b..0b99abcd27c 100644
--- a/src/vs/workbench/electron-browser/media/shell.css
+++ b/src/vs/workbench/electron-browser/media/shell.css
@@ -204,7 +204,7 @@
 
 /* END Keyboard Focus Indication Styles */
 
-/* TODO@theme */
+/* TODO@theme (widgets) */
 
 .monaco-shell.vs input {
 	background-color: white;
diff --git a/src/vs/workbench/electron-browser/media/workbench.css b/src/vs/workbench/electron-browser/media/workbench.css
index 379928f6df8..f355796a2a7 100644
--- a/src/vs/workbench/electron-browser/media/workbench.css
+++ b/src/vs/workbench/electron-browser/media/workbench.css
@@ -37,25 +37,7 @@
 	z-index: 10000;
 }
 
-.hc-black #monaco-workbench-drop-overlay {
-	background: none !important;
-	outline: 2px dashed;
-	outline-offset: -2px;
-}
-
-/* TODO@theme */
-
-.vs #monaco-workbench-drop-overlay {
-	background-color: rgba(51,153,255, 0.18);
-}
-
-.vs-dark #monaco-workbench-drop-overlay {
-	background-color: rgba(83, 89, 93, 0.5);
-}
-
-.hc-black #monaco-workbench-drop-overlay {
-	outline-color: #f38518;
-}
+/* TODO@theme (widgets) */
 
 .vs-dark .monaco-workbench .monaco-scrollable-element .shadow.top {
 	box-shadow: #000 0 6px 6px -6px inset;
diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts
index d3c07737b1e..db7b70c5409 100644
--- a/src/vs/workbench/electron-browser/window.ts
+++ b/src/vs/workbench/electron-browser/window.ts
@@ -46,8 +46,10 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
 import { Position, IResourceInput } from 'vs/platform/editor/common/editor';
 import { IExtensionService } from 'vs/platform/extensions/common/extensions';
+import { Themable, EDITOR_DRAG_AND_DROP_BACKGROUND } from 'vs/workbench/common/theme';
 
 import { remote, ipcRenderer as ipc, webFrame } from 'electron';
+import { highContrastOutline } from "vs/platform/theme/common/colorRegistry";
 
 const dialog = remote.dialog;
 
@@ -62,7 +64,7 @@ const TextInputActions: IAction[] = [
 	new Action('editor.action.selectAll', nls.localize('selectAll', "Select All"), null, true, () => document.execCommand('selectAll') && TPromise.as(true))
 ];
 
-export class ElectronWindow {
+export class ElectronWindow extends Themable {
 
 	private static AUTO_SAVE_SETTING = 'files.autoSave';
 
@@ -80,7 +82,7 @@ export class ElectronWindow {
 		@IWindowService private windowService: IWindowService,
 		@IWorkspaceConfigurationService private configurationService: IWorkspaceConfigurationService,
 		@ITitleService private titleService: ITitleService,
-		@IWorkbenchThemeService private themeService: IWorkbenchThemeService,
+		@IWorkbenchThemeService protected themeService: IWorkbenchThemeService,
 		@IMessageService private messageService: IMessageService,
 		@IConfigurationEditingService private configurationEditingService: IConfigurationEditingService,
 		@ICommandService private commandService: ICommandService,
@@ -91,6 +93,8 @@ export class ElectronWindow {
 		@IEnvironmentService private environmentService: IEnvironmentService,
 		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
 	) {
+		super(themeService);
+
 		this.win = win;
 		this.windowId = win.id;
 
@@ -131,8 +135,18 @@ export class ElectronWindow {
 				// Find out if folders are dragged and show the appropiate feedback then
 				this.includesFolder(draggedExternalResources).done(includesFolder => {
 					if (includesFolder) {
+						const useOutline = this.isHighContrastTheme;
 						dropOverlay = $(window.document.getElementById(this.partService.getWorkbenchElementId()))
-							.div({ id: 'monaco-workbench-drop-overlay' })
+							.div({
+								id: 'monaco-workbench-drop-overlay'
+							})
+							.style({
+								backgroundColor: this.getColor(EDITOR_DRAG_AND_DROP_BACKGROUND),
+								outlineColor: useOutline ? this.getColor(highContrastOutline) : null,
+								outlineOffset: useOutline ? '-2px' : null,
+								outlineStyle: useOutline ? 'dashed' : null,
+								outlineWidth: useOutline ? '2px' : null
+							})
 							.on(DOM.EventType.DROP, (e: DragEvent) => {
 								DOM.EventHelper.stop(e, true);
 
-- 
GitLab