Status bar spinner is white in light themes and hard to see (microsoft#46083)

bpasero · web-flow · commit 9b25468ef0dc · 2018-03-19T07:31:11.000+01:00
fixes microsoft#45191
diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts
@@ -550,7 +550,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService
 		if (this.partService.isCreated() && !errors.isPromiseCanceledError(error)) {
 			const actions: INotificationActions = { primary: [] };
 			if (errors.isErrorWithActions(error)) {
-				actions.primary = error.actions;
+				actions.primary = (error as errors.IErrorWithActions).actions;
 			}
 
 			const handle = this.notificationService.notify({
diff --git a/src/vs/workbench/services/configuration/node/configuration.ts b/src/vs/workbench/services/configuration/node/configuration.ts
@@ -254,7 +254,7 @@ export class FolderConfiguration extends Disposable {
 		for (let i = 0, len = events.length; i < len; i++) {
 			const resource = events[i].resource;
 			const isJson = paths.extname(resource.fsPath) === '.json';
-			const isDeletedSettingsFolder = (events[i].type === FileChangeType.DELETED && paths.isEqual(paths.basename(resource.fsPath), this.configFolderRelativePath));
+			const isDeletedSettingsFolder = (events[i].type === FileChangeType.DELETED && paths.basename(resource.fsPath) === this.configFolderRelativePath);
 			if (!isJson && !isDeletedSettingsFolder) {
 				continue; // only JSON files or the actual settings folder
 			}
diff --git a/src/vs/workbench/services/progress/browser/media/progress.svg b/src/vs/workbench/services/progress/browser/media/progress.svg
diff --git a/src/vs/workbench/services/progress/browser/media/progressService2.css b/src/vs/workbench/services/progress/browser/media/progressService2.css
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 .monaco-workbench > .part.statusbar > .statusbar-item.progress {
-	background-image: url(progress.svg);
-	background-repeat: no-repeat;
-	background-position: left;
-	padding-left: 14px;
-	display: inline;
+	padding-left: 5px;
+}
+
+.monaco-workbench > .part.statusbar > .statusbar-item.progress .spinner-container {
+	padding-right: 5px;
 }
 
 .monaco-workbench .progress-badge > .badge-content {
diff --git a/src/vs/workbench/services/progress/browser/progressService2.ts b/src/vs/workbench/services/progress/browser/progressService2.ts
@@ -30,9 +30,25 @@ class WindowProgressItem implements IStatusbarItem {
 
 	render(element: HTMLElement): IDisposable {
 		this._element = element;
-		this._label = new OcticonLabel(this._element);
 		this._element.classList.add('progress');
+
+		const container = document.createElement('span');
+		this._element.appendChild(container);
+
+		const spinnerContainer = document.createElement('span');
+		spinnerContainer.classList.add('spinner-container');
+		container.appendChild(spinnerContainer);
+
+		const spinner = new OcticonLabel(spinnerContainer);
+		spinner.text = '$(sync~spin)';
+
+		const labelContainer = document.createElement('span');
+		container.appendChild(labelContainer);
+
+		this._label = new OcticonLabel(labelContainer);
+
 		this.hide();
+
 		return null;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ export class EditorPart extends Part implements IEditorPart, IEditorGroupService`
`550`	`550`	`if (this.partService.isCreated() && !errors.isPromiseCanceledError(error)) {`
`551`	`551`	`const actions: INotificationActions = { primary: [] };`
`552`	`552`	`if (errors.isErrorWithActions(error)) {`
`553`		`- actions.primary = error.actions;`
	`553`	`+ actions.primary = (error as errors.IErrorWithActions).actions;`
`554`	`554`	`}`
`555`	`555`
`556`	`556`	`const handle = this.notificationService.notify({`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ export class FolderConfiguration extends Disposable {`
`254`	`254`	`for (let i = 0, len = events.length; i < len; i++) {`
`255`	`255`	`const resource = events[i].resource;`
`256`	`256`	`const isJson = paths.extname(resource.fsPath) === '.json';`
`257`		`- const isDeletedSettingsFolder = (events[i].type === FileChangeType.DELETED && paths.isEqual(paths.basename(resource.fsPath), this.configFolderRelativePath));`
	`257`	`+ const isDeletedSettingsFolder = (events[i].type === FileChangeType.DELETED && paths.basename(resource.fsPath) === this.configFolderRelativePath);`
`258`	`258`	`if (!isJson && !isDeletedSettingsFolder) {`
`259`	`259`	`continue; // only JSON files or the actual settings folder`
`260`	`260`	`}`