Titlebar overlay is not enabled (fix #158203) (#158251)

microsoft · Aug 16, 2022 · 2857051 · 2857051
1 parent 4b6ccd8
commit 2857051
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/vs/platform/window/common/window.ts b/src/vs/platform/window/common/window.ts
@@ -165,16 +165,20 @@ export function getTitleBarStyle(configurationService: IConfigurationService): '
 }
 
 export function useWindowControlsOverlay(configurationService: IConfigurationService, environmentService: IEnvironmentService): boolean {
-	// Window Controls Overlay are only configurable on Windows
 	if (!isWindows || isWeb || !environmentService.isBuilt) {
-		return false;
+		return false; // only supported on a built desktop windows instance
 	}
 
 	if (getTitleBarStyle(configurationService) === 'native') {
-		return false;
+		return false; // only supported when title bar is custom
 	}
 
-	return configurationService.getValue<boolean>('window.experimental.windowControlsOverlay.enabled');
+	const configuredUseWindowControlsOverlay = configurationService.getValue<boolean | undefined>('window.experimental.windowControlsOverlay.enabled');
+	if (typeof configuredUseWindowControlsOverlay === 'boolean') {
+		return configuredUseWindowControlsOverlay;
+	}
+
+	return true; // enabled by default
 }
 
 export interface IPath<T = IEditorOptions> extends IPathData<T> {

diff --git a/src/vs/platform/windows/electron-main/windowImpl.ts b/src/vs/platform/windows/electron-main/windowImpl.ts
@@ -143,6 +143,8 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 	private representedFilename: string | undefined;
 	private documentEdited: boolean | undefined;
 
+	private readonly hasWindowControlOverlay: boolean = false;
+
 	private readonly whenReadyCallbacks: { (window: ICodeWindow): void }[] = [];
 
 	private readonly touchBarGroups: TouchBarSegmentedControl[] = [];
@@ -280,6 +282,8 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 						color: titleBarColor,
 						symbolColor
 					};
+
+					this.hasWindowControlOverlay = true;
 				}
 			}
 
@@ -1072,7 +1076,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		}
 
 		// Windows: window control overlay (WCO)
-		if (isWindows && useWindowControlsOverlay(this.configurationService, this.environmentMainService)) {
+		if (isWindows && this.hasWindowControlOverlay) {
 			this._win.setTitleBarOverlay({
 				color: options.backgroundColor?.trim() === '' ? undefined : options.backgroundColor,
 				symbolColor: options.foregroundColor?.trim() === '' ? undefined : options.foregroundColor,