Skip to content

Commit

Permalink
fix #63765
Browse files Browse the repository at this point in the history
  • Loading branch information
bpasero committed Nov 26, 2018
1 parent 91fb4ec commit 4b9e342
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/vs/code/electron-main/window.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
options.tabbingIdentifier = product.nameShort; // this opts in to sierra tabs
}

const useCustomTitleStyle = getTitleBarStyle(this.configurationService, this.environmentService) === 'custom';
const useCustomTitleStyle = getTitleBarStyle(this.configurationService, this.environmentService, !!config.extensionDevelopmentPath) === 'custom';
if (useCustomTitleStyle) {
options.titleBarStyle = 'hidden';
this.hiddenTitleBarStyle = true;
Expand Down
4 changes: 2 additions & 2 deletions src/vs/platform/windows/common/windows.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ export interface IWindowSettings {
clickThroughInactive: boolean;
}

export function getTitleBarStyle(configurationService: IConfigurationService, environment: IEnvironmentService): 'native' | 'custom' {
export function getTitleBarStyle(configurationService: IConfigurationService, environment: IEnvironmentService, isExtensionDevelopment = environment.isExtensionDevelopment): 'native' | 'custom' {
const configuration = configurationService.getValue<IWindowSettings>('window');

const isDev = !environment.isBuilt || environment.isExtensionDevelopment;
const isDev = !environment.isBuilt || isExtensionDevelopment;
if (isMacintosh && isDev) {
return 'native'; // not enabled when developing due to https://github.com/electron/electron/issues/3647
}
Expand Down

0 comments on commit 4b9e342

Please sign in to comment.