macOS: detect high contrast theme (fix microsoft#105481)

Benjamin Pasero · Benjamin Pasero · commit 21dd836ddbdb · 2020-08-27T10:45:00.000+02:00
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
@@ -778,7 +778,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		if (windowConfig?.autoDetectHighContrast === false) {
 			autoDetectHighContrast = false;
 		}
-		windowConfiguration.highContrast = isWindows && autoDetectHighContrast && nativeTheme.shouldUseInvertedColorScheme;
+		windowConfiguration.highContrast = (isWindows || isMacintosh) && autoDetectHighContrast && nativeTheme.shouldUseInvertedColorScheme;
 		windowConfiguration.accessibilitySupport = app.accessibilitySupportEnabled;
 
 		// Title style related
diff --git a/src/vs/platform/theme/electron-main/themeMainService.ts b/src/vs/platform/theme/electron-main/themeMainService.ts
@@ -42,14 +42,14 @@ export class ThemeMainService implements IThemeMainService {
 	}
 
 	getBackgroundColor(): string {
-		if (isWindows && nativeTheme.shouldUseInvertedColorScheme) {
+		if ((isWindows || isMacintosh) && nativeTheme.shouldUseInvertedColorScheme) {
 			return DEFAULT_BG_HC_BLACK;
 		}
 
 		let background = this.stateService.getItem<string | null>(THEME_BG_STORAGE_KEY, null);
 		if (!background) {
 			let baseTheme: string;
-			if (isWindows && nativeTheme.shouldUseInvertedColorScheme) {
+			if ((isWindows || isMacintosh) && nativeTheme.shouldUseInvertedColorScheme) {
 				baseTheme = 'hc-black';
 			} else {
 				baseTheme = this.stateService.getItem<string>(THEME_STORAGE_KEY, 'vs-dark').split(' ')[0];
diff --git a/src/vs/platform/windows/electron-main/windowsMainService.ts b/src/vs/platform/windows/electron-main/windowsMainService.ts
@@ -212,8 +212,8 @@ export class WindowsMainService extends Disposable implements IWindowsMainServic
 
 	private registerListeners(): void {
 
-		// React to HC color scheme changes (Windows)
-		if (isWindows) {
+		// React to HC color scheme changes (Windows, macOS)
+		if (isWindows || isMacintosh) {
 			nativeTheme.on('updated', () => {
 				if (nativeTheme.shouldUseInvertedColorScheme || nativeTheme.shouldUseHighContrastColors) {
 					this.sendToAll('vscode:enterHighContrast');
diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
@@ -258,9 +258,9 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema';
 			'window.autoDetectHighContrast': {
 				'type': 'boolean',
 				'default': true,
-				'description': nls.localize('autoDetectHighContrast', "If enabled, will automatically change to high contrast theme if Windows is using a high contrast theme, and to dark theme when switching away from a Windows high contrast theme."),
+				'description': nls.localize('autoDetectHighContrast', "If enabled, will automatically change to high contrast theme if the OS is using a high contrast theme, and to dark theme when switching away from a high contrast theme."),
 				'scope': ConfigurationScope.APPLICATION,
-				'included': isWindows
+				'included': isWindows || isMacintosh
 			},
 			'window.doubleClickIconToClose': {
 				'type': 'boolean',
diff --git a/src/vs/workbench/services/themes/common/themeConfiguration.ts b/src/vs/workbench/services/themes/common/themeConfiguration.ts
@@ -14,7 +14,7 @@ import { workbenchColorsSchemaId } from 'vs/platform/theme/common/colorRegistry'
 import { tokenStylingSchemaId } from 'vs/platform/theme/common/tokenClassificationRegistry';
 import { ThemeSettings, IWorkbenchColorTheme, IWorkbenchFileIconTheme, IColorCustomizations, ITokenColorCustomizations, IWorkbenchProductIconTheme, ISemanticTokenColorCustomizations, IExperimentalSemanticTokenColorCustomizations } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
-import { isWeb } from 'vs/base/common/platform';
+import { isMacintosh, isWeb, isWindows } from 'vs/base/common/platform';
 
 const DEFAULT_THEME_DARK_SETTING_VALUE = 'Default Dark+';
 const DEFAULT_THEME_LIGHT_SETTING_VALUE = 'Default Light+';
@@ -60,6 +60,7 @@ const preferredHCThemeSettingSchema: IConfigurationPropertySchema = {
 	default: DEFAULT_THEME_HC_SETTING_VALUE,
 	enum: colorThemeSettingEnum,
 	enumDescriptions: colorThemeSettingEnumDescriptions,
+	included: isWindows || isMacintosh,
 	errorMessage: nls.localize('colorThemeError', "Theme is unknown or not installed."),
 };
 const detectColorSchemeSettingSchema: IConfigurationPropertySchema = {

Original file line number	Diff line number	Diff line change
`@@ -778,7 +778,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {`
`778`	`778`	`if (windowConfig?.autoDetectHighContrast === false) {`
`779`	`779`	`autoDetectHighContrast = false;`
`780`	`780`	`}`
`781`		`- windowConfiguration.highContrast = isWindows && autoDetectHighContrast && nativeTheme.shouldUseInvertedColorScheme;`
	`781`	`+ windowConfiguration.highContrast = (isWindows \|\| isMacintosh) && autoDetectHighContrast && nativeTheme.shouldUseInvertedColorScheme;`
`782`	`782`	`windowConfiguration.accessibilitySupport = app.accessibilitySupportEnabled;`
`783`	`783`
`784`	`784`	`// Title style related`