From d06000103fe707a3f3f17c52bbf00d7cdcd624f5 Mon Sep 17 00:00:00 2001 From: Nick Denry Date: Thu, 28 May 2020 00:05:11 +0300 Subject: [PATCH] Platform-dependent "About" menu placement --- modules/menu-service.js | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/modules/menu-service.js b/modules/menu-service.js index 52b2739..669e5b7 100644 --- a/modules/menu-service.js +++ b/modules/menu-service.js @@ -9,19 +9,23 @@ let menuService = {} menuService.createMenu = () => { + const isMac = process.platform === 'darwin' + + const about = { + label: 'About Chimeverse', + click: () => { + // @see https://github.com/electron/electron/issues/16558#issuecomment-484460276 + // let activeWindow = BrowserWindow.getFocusedWindow() + let activeWindow = BrowserWindow.getAllWindows()[0] + activeWindow.show() + activeWindow.webContents.send('about-page-event') + } + } + const application = { label: 'Chimeverse', submenu: [ - { - label: 'About Chimeverse', - click: () => { - // @see https://github.com/electron/electron/issues/16558#issuecomment-484460276 - // let activeWindow = BrowserWindow.getFocusedWindow() - let activeWindow = BrowserWindow.getAllWindows()[0] - activeWindow.show() - activeWindow.webContents.send('about-page-event') - } - }, + ... isMac ? [about] : [], { label: 'Reconnect', accelerator: 'CmdOrCtrl+R', @@ -103,7 +107,12 @@ menuService.createMenu = () => { ], } - const template = [application, edit] + const help = { + label: 'Help', + submenu: [about] + } + + const template = [application, edit, ... !isMac ? help : []] Menu.setApplicationMenu(Menu.buildFromTemplate(template)) }