paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-11-21 15:08:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set application menu in AppMenu.setMenu instead of in main.js.

Browse Source
This commit is contained in:
Zhongyi Tong
2017-08-06 00:25:56 +08:00
parent 347f6e50eb
commit a7a9e96a58
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/index.js
View File

@@ -153,7 +153,7 @@ app.on('activate', () => {
}); });
app.on('ready', () => { app.on('ready', () => {
electron.Menu.setApplicationMenu(appMenu.getMenu()); appMenu.setMenu();
mainWindow = createMainWindow(); mainWindow = createMainWindow();
const page = mainWindow.webContents; const page = mainWindow.webContents;

5
app/main/menu.js
View File

@@ -343,9 +343,10 @@ class AppMenu {
}); });
} }
getMenu() { setMenu() {
const tpl = process.platform === 'darwin' ? this.getDarwinTpl() : this.getOtherTpl(); const tpl = process.platform === 'darwin' ? this.getDarwinTpl() : this.getOtherTpl();
return Menu.buildFromTemplate(tpl); const menu = Menu.buildFromTemplate(tpl);
Menu.setApplicationMenu(menu);
} }
} }