disable support for simple fullscreen (microsoft#75054)

Benjamin Pasero · Benjamin Pasero · commit 4a15a87336c6 · 2019-06-24T18:21:51.000+02:00
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
@@ -869,16 +869,17 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 	}
 
 	private useNativeFullScreen(): boolean {
-		const windowConfig = this.configurationService.getValue<IWindowSettings>('window');
-		if (!windowConfig || typeof windowConfig.nativeFullScreen !== 'boolean') {
-			return true; // default
-		}
+		return true;
+		// const windowConfig = this.configurationService.getValue<IWindowSettings>('window');
+		// if (!windowConfig || typeof windowConfig.nativeFullScreen !== 'boolean') {
+		// 	return true; // default
+		// }
 
-		if (windowConfig.nativeTabs) {
-			return true; // https://github.com/electron/electron/issues/16142
-		}
+		// if (windowConfig.nativeTabs) {
+		// 	return true; // https://github.com/electron/electron/issues/16142
+		// }
 
-		return windowConfig.nativeFullScreen !== false;
+		// return windowConfig.nativeFullScreen !== false;
 	}
 
 	isMinimized(): boolean {
diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts
@@ -300,7 +300,7 @@ export function getTitleBarStyle(configurationService: IConfigurationService, en
 			return 'native'; // native tabs on sierra do not work with custom title style
 		}
 
-		const useSimpleFullScreen = isMacintosh && configuration.nativeFullScreen === false;
+		const useSimpleFullScreen = false; //isMacintosh && configuration.nativeFullScreen === false;
 		if (useSimpleFullScreen) {
 			return 'native'; // simple fullscreen does not work well with custom title style (https://github.com/Microsoft/vscode/issues/63291)
 		}
diff --git a/src/vs/workbench/electron-browser/main.contribution.ts b/src/vs/workbench/electron-browser/main.contribution.ts
@@ -560,7 +560,7 @@ import product from 'vs/platform/product/node/product';
 				'default': true,
 				'description': nls.localize('window.nativeFullScreen', "Controls if native full-screen should be used on macOS. Disable this option to prevent macOS from creating a new space when going full-screen."),
 				'scope': ConfigurationScope.APPLICATION,
-				'included': isMacintosh
+				'included': false /* isMacintosh */
 			},
 			'window.clickThroughInactive': {
 				'type': 'boolean',

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ export function getTitleBarStyle(configurationService: IConfigurationService, en`
`300`	`300`	`return 'native'; // native tabs on sierra do not work with custom title style`
`301`	`301`	`}`
`302`	`302`
`303`		`- const useSimpleFullScreen = isMacintosh && configuration.nativeFullScreen === false;`
	`303`	`+ const useSimpleFullScreen = false; //isMacintosh && configuration.nativeFullScreen === false;`
`304`	`304`	`if (useSimpleFullScreen) {`
`305`	`305`	`return 'native'; // simple fullscreen does not work well with custom title style (https://github.com/Microsoft/vscode/issues/63291)`
`306`	`306`	`}`