Skip to content

Commit 9a6d4fa

Browse files
authored
remove WCO experimental setting (microsoft#188793)
* remove WCO experimental setting * extra bits
1 parent 9bcb556 commit 9a6d4fa

File tree

3 files changed

+2
-19
lines changed

3 files changed

+2
-19
lines changed

src/vs/platform/window/common/window.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,6 @@ export function useWindowControlsOverlay(configurationService: IConfigurationSer
174174
return false; // only supported when title bar is custom
175175
}
176176

177-
const configuredUseWindowControlsOverlay = configurationService.getValue<boolean | undefined>('window.experimental.windowControlsOverlay.enabled');
178-
if (typeof configuredUseWindowControlsOverlay === 'boolean') {
179-
return configuredUseWindowControlsOverlay;
180-
}
181-
182177
// Default to true.
183178
return true;
184179
}

src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
1515
import { RunOnceScheduler } from 'vs/base/common/async';
1616
import { URI } from 'vs/base/common/uri';
1717
import { isEqual } from 'vs/base/common/resources';
18-
import { isMacintosh, isNative, isLinux, isWindows } from 'vs/base/common/platform';
18+
import { isMacintosh, isNative, isLinux } from 'vs/base/common/platform';
1919
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
2020
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
2121
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
@@ -26,7 +26,7 @@ interface IConfiguration extends IWindowsConfiguration {
2626
debug?: { console?: { wordWrap?: boolean } };
2727
editor?: { accessibilitySupport?: 'on' | 'off' | 'auto' };
2828
security?: { workspace?: { trust?: { enabled?: boolean } }; restrictUNCAccess?: boolean };
29-
window: IWindowSettings & { experimental?: { windowControlsOverlay?: { enabled?: boolean } } };
29+
window: IWindowSettings;
3030
workbench?: { enableExperiments?: boolean };
3131
_extensionsGallery?: { enablePPE?: boolean };
3232
}
@@ -35,7 +35,6 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
3535

3636
private static SETTINGS = [
3737
'window.titleBarStyle',
38-
'window.experimental.windowControlsOverlay.enabled',
3938
'window.nativeTabs',
4039
'window.nativeFullScreen',
4140
'window.clickThroughInactive',
@@ -48,7 +47,6 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
4847
];
4948

5049
private readonly titleBarStyle = new ChangeObserver<'native' | 'custom'>('string');
51-
private readonly windowControlsOverlayEnabled = new ChangeObserver('boolean');
5250
private readonly nativeTabs = new ChangeObserver('boolean');
5351
private readonly nativeFullScreen = new ChangeObserver('boolean');
5452
private readonly clickThroughInactive = new ChangeObserver('boolean');
@@ -89,9 +87,6 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
8987
// Titlebar style
9088
processChanged((config.window.titleBarStyle === 'native' || config.window.titleBarStyle === 'custom') && this.titleBarStyle.handleChange(config.window?.titleBarStyle));
9189

92-
// Windows: Window Controls Overlay
93-
processChanged(isWindows && this.windowControlsOverlayEnabled.handleChange(config.window?.experimental?.windowControlsOverlay?.enabled));
94-
9590
// macOS: Native tabs
9691
processChanged(isMacintosh && this.nativeTabs.handleChange(config.window?.nativeTabs));
9792

src/vs/workbench/electron-sandbox/desktop.contribution.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -222,13 +222,6 @@ import { applicationConfigurationNodeBase } from 'vs/workbench/common/configurat
222222
'scope': ConfigurationScope.APPLICATION,
223223
'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.")
224224
},
225-
'window.experimental.windowControlsOverlay.enabled': {
226-
'type': 'boolean',
227-
'default': true,
228-
'scope': ConfigurationScope.APPLICATION,
229-
'description': localize('windowControlsOverlay', "Use window controls provided by the platform instead of our HTML-based window controls. Changes require a full restart to apply."),
230-
'included': isWindows
231-
},
232225
'window.experimental.nativeContextMenuLocation': { // TODO@bpasero remove me eventually
233226
'type': 'boolean',
234227
'default': true,

0 commit comments

Comments
 (0)