Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-04 07:15:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't show menubar too early

Browse Source
This commit is contained in:
SteVen Batten
2018-07-30 16:54:38 -07:00
parent 423da148d3
commit 6d7c257f38
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/code/electron-main/menubar.ts
View File

@@ -310,7 +310,11 @@ export class Menubar {
menubar.append(helpMenuItem);
}
Menu.setApplicationMenu(menubar);
if (menubar.items && menubar.items.length > 0) {
Menu.setApplicationMenu(menubar);
} else {
Menu.setApplicationMenu(null);
}
}
private setMacApplicationMenu(macApplicationMenu: Electron.Menu): void {
@@ -370,14 +374,14 @@ export class Menubar {
switch (menuId) {
case 'File':
case 'Help':
return true;
return isMacintosh || !!this.menubarMenus[menuId];
default:
return this.windowsMainService.getWindowCount() > 0 && !!this.menubarMenus[menuId];
}
}
private shouldFallback(menuId: string): boolean {
return this.shouldDrawMenu(menuId) && (this.windowsMainService.getWindowCount() === 0);
return this.shouldDrawMenu(menuId) && (this.windowsMainService.getWindowCount() === 0 && isMacintosh);
}
private setFallbackMenuById(menu: Electron.Menu, menuId: string): void {