diff --git a/src/vs/platform/window/common/window.ts b/src/vs/platform/window/common/window.ts index 85d442d8b06aa..4a4a5091f8cef 100644 --- a/src/vs/platform/window/common/window.ts +++ b/src/vs/platform/window/common/window.ts @@ -172,7 +172,7 @@ export function useWindowControlsOverlay(configurationService: IConfigurationSer return false; // only supported when title bar is custom } - const configuredUseWindowControlsOverlay = configurationService.getValue('window.experimental.windowControlsOverlay.enabled'); + const configuredUseWindowControlsOverlay = configurationService.getValue('window.enableWindowControlsOverlay'); if (typeof configuredUseWindowControlsOverlay === 'boolean') { return configuredUseWindowControlsOverlay; } diff --git a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts index 2bd9e8e9876a3..05865cc7a8909 100644 --- a/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts +++ b/src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts @@ -26,7 +26,7 @@ interface IConfiguration extends IWindowsConfiguration { debug?: { console?: { wordWrap?: boolean } }; editor?: { accessibilitySupport?: 'on' | 'off' | 'auto' }; security?: { workspace?: { trust?: { enabled?: boolean } } }; - window: IWindowSettings & { experimental?: { windowControlsOverlay?: { enabled?: boolean }; useSandbox?: boolean } }; + window: IWindowSettings & { enableWindowControlsOverlay?: boolean; experimental?: { useSandbox?: boolean } }; workbench?: { experimental?: { settingsProfiles?: { enabled?: boolean } }; enableExperiments?: boolean }; extensions?: { experimental?: { useUtilityProcess?: boolean } }; _extensionsGallery?: { enablePPE?: boolean }; @@ -73,7 +73,7 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo processChanged((config.window.titleBarStyle === 'native' || config.window.titleBarStyle === 'custom') && this.titleBarStyle.handleChange(config.window?.titleBarStyle)); // Windows: Window Controls Overlay - processChanged(isWindows && this.windowControlsOverlayEnabled.handleChange(config.window?.experimental?.windowControlsOverlay?.enabled)); + processChanged(isWindows && this.windowControlsOverlayEnabled.handleChange(config.window?.enableWindowControlsOverlay)); // Windows: Sandbox processChanged(this.windowSandboxEnabled.handleChange(config.window?.experimental?.useSandbox)); diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts index d63c51a6303cd..e76e17d871e26 100644 --- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts +++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts @@ -205,7 +205,7 @@ import product from 'vs/platform/product/common/product'; 'scope': ConfigurationScope.APPLICATION, 'description': localize('titleBarStyle', "Adjust the appearance of the window title bar. On Linux and Windows, this setting also affects the application and context menu appearances. Changes require a full restart to apply.") }, - 'window.experimental.windowControlsOverlay.enabled': { + 'window.enableWindowControlsOverlay': { 'type': 'boolean', 'default': true, 'scope': ConfigurationScope.APPLICATION,