ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ignore the users title bar settings (#4625)

Browse Source 
* ignore the users title bar settings

* ignore in more places
This commit is contained in:
Anthony Dresser
2019-03-20 19:39:43 -07:00
committed by GitHub
parent 5b0e86b179
commit 8298db7d13
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/platform/windows/common/windows.ts
View File

@@ -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) return 'native'; // simple fullscreen does not work well with custom title style (https://github.com/Microsoft/vscode/issues/63291)
} }
const style = configuration.titleBarStyle; // {{SQL CARBON EDIT}} - Always use native toolbar
if (style === 'native' || style === 'custom') { // const style = configuration.titleBarStyle;
return style; // if (style === 'native' || style === 'custom') {
} // return style;
// }
} }
// {{SQL CARBON EDIT}} - Always use native toolbar // {{SQL CARBON EDIT}} - Always use native toolbar

9
src/vs/workbench/contrib/relauncher/electron-browser/relauncher.contribution.ts
View File

@@ -59,11 +59,12 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
private onConfigurationChange(config: IConfiguration, notify: boolean): void { private onConfigurationChange(config: IConfiguration, notify: boolean): void {
let changed = false; let changed = false;
// {{SQL CARBON EDIT}}
// Titlebar style // Titlebar style
if (config.window && config.window.titleBarStyle !== this.titleBarStyle && (config.window.titleBarStyle === 'native' || config.window.titleBarStyle === 'custom')) { // if (config.window && config.window.titleBarStyle !== this.titleBarStyle && (config.window.titleBarStyle === 'native' || config.window.titleBarStyle === 'custom')) {
this.titleBarStyle = config.window.titleBarStyle; // this.titleBarStyle = 'native'; //config.window.titleBarStyle;
changed = true; // changed = true;
} // }
// macOS: Native tabs // macOS: Native tabs
if (isMacintosh && config.window && typeof config.window.nativeTabs === 'boolean' && config.window.nativeTabs !== this.nativeTabs) { if (isMacintosh && config.window && typeof config.window.nativeTabs === 'boolean' && config.window.nativeTabs !== this.nativeTabs) {