diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts index 48055ea90715a..517417b986792 100644 --- a/src/vs/code/electron-main/window.ts +++ b/src/vs/code/electron-main/window.ts @@ -838,17 +838,16 @@ export class CodeWindow extends Disposable implements ICodeWindow { } private useNativeFullScreen(): boolean { - return true; // TODO@ben enable simple fullscreen again (https://github.com/microsoft/vscode/issues/75054) - // const windowConfig = this.configurationService.getValue('window'); - // if (!windowConfig || typeof windowConfig.nativeFullScreen !== 'boolean') { - // return true; // default - // } + const windowConfig = this.configurationService.getValue('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 index 8429e3495b938..9be9dbfc29156 100644 --- a/src/vs/platform/windows/common/windows.ts +++ b/src/vs/platform/windows/common/windows.ts @@ -303,7 +303,7 @@ export function getTitleBarStyle(configurationService: IConfigurationService, en return 'native'; // native tabs on sierra do not work with custom title style } - const useSimpleFullScreen = false; //isMacintosh && configuration.nativeFullScreen === false; + const useSimpleFullScreen = 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 index 10557fccab01f..97a9dfe174436 100644 --- a/src/vs/workbench/electron-browser/main.contribution.ts +++ b/src/vs/workbench/electron-browser/main.contribution.ts @@ -506,7 +506,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': false /* isMacintosh */ + 'included': isMacintosh }, 'window.clickThroughInactive': { 'type': 'boolean', @@ -533,4 +533,4 @@ import product from 'vs/platform/product/node/product'; } } }); -})(); \ No newline at end of file +})();