From 8298db7d1349ef161d7ca3c5d4db4f280c8cf121 Mon Sep 17 00:00:00 2001 From: Anthony Dresser Date: Wed, 20 Mar 2019 19:39:43 -0700 Subject: [PATCH] Ignore the users title bar settings (#4625) * ignore the users title bar settings * ignore in more places --- src/vs/platform/windows/common/windows.ts | 9 +++++---- .../electron-browser/relauncher.contribution.ts | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/vs/platform/windows/common/windows.ts b/src/vs/platform/windows/common/windows.ts index 0b29d51883..e8b9f43826 100644 --- a/src/vs/platform/windows/common/windows.ts +++ b/src/vs/platform/windows/common/windows.ts @@ -277,10 +277,11 @@ export function getTitleBarStyle(configurationService: IConfigurationService, en return 'native'; // simple fullscreen does not work well with custom title style (https://github.com/Microsoft/vscode/issues/63291) } - const style = configuration.titleBarStyle; - if (style === 'native' || style === 'custom') { - return style; - } + // {{SQL CARBON EDIT}} - Always use native toolbar + // const style = configuration.titleBarStyle; + // if (style === 'native' || style === 'custom') { + // return style; + // } } // {{SQL CARBON EDIT}} - Always use native toolbar diff --git a/src/vs/workbench/contrib/relauncher/electron-browser/relauncher.contribution.ts b/src/vs/workbench/contrib/relauncher/electron-browser/relauncher.contribution.ts index 70b96574e0..b601ed8153 100644 --- a/src/vs/workbench/contrib/relauncher/electron-browser/relauncher.contribution.ts +++ b/src/vs/workbench/contrib/relauncher/electron-browser/relauncher.contribution.ts @@ -59,11 +59,12 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo private onConfigurationChange(config: IConfiguration, notify: boolean): void { let changed = false; + // {{SQL CARBON EDIT}} // Titlebar style - if (config.window && config.window.titleBarStyle !== this.titleBarStyle && (config.window.titleBarStyle === 'native' || config.window.titleBarStyle === 'custom')) { - this.titleBarStyle = config.window.titleBarStyle; - changed = true; - } + // if (config.window && config.window.titleBarStyle !== this.titleBarStyle && (config.window.titleBarStyle === 'native' || config.window.titleBarStyle === 'custom')) { + // this.titleBarStyle = 'native'; //config.window.titleBarStyle; + // changed = true; + // } // macOS: Native tabs if (isMacintosh && config.window && typeof config.window.nativeTabs === 'boolean' && config.window.nativeTabs !== this.nativeTabs) {