Merge pull request #446 from h3poteto/iss-377

closes #377 Hide and show application in mac

src/main/index.js

@@ -76,23 +76,62 @@ async function listAccounts () {
   }
 }
 
-function createWindow () {
+async function changeAccount (account, index) {
+  // In MacOS, user can hide the window.
+  // In this time, mainWindow in not exist, so we have to create window.
+  if (mainWindow === null) {
+    await createWindow()
+    // We have to wait the web contents is loaded.
+    mainWindow.webContents.on('did-finish-load', () => {
+      mainWindow.webContents.send('change-account', Object.assign(account, { index: index }))
+    })
+  } else {
+    mainWindow.webContents.send('change-account', Object.assign(account, { index: index }))
+  }
+}
+
+async function createWindow () {
   /**
    * List accounts
    */
-  listAccounts()
+  const accounts = await listAccounts()
-    .then((accounts) => {
   const accountsChange = accounts.map((a, index) => {
     return {
       label: a.domain,
       accelerator: `CmdOrCtrl+${index + 1}`,
-          click: () => {
+      click: () => changeAccount(a, index)
-            mainWindow.webContents.send('change-account', Object.assign(a, { index: index }))
-          }
     }
   })
   /**
-       * Set menu
+   * For mac menu
+   */
+  const macGeneralMenu = process.platform !== 'darwin' ? [] : [
+    {
+      type: 'separator'
+    },
+    {
+      label: 'Services',
+      role: 'services',
+      submenu: []
+    },
+    {
+      type: 'separator'
+    },
+    {
+      label: 'Hide Whalebird',
+      role: 'hide'
+    },
+    {
+      label: 'Hide Othres',
+      role: 'hideothers'
+    },
+    {
+      label: 'Show All',
+      role: 'unhide'
+    }
+  ]
+  /**
+   * Set application menu
    */
   const template = [
     {
@@ -120,6 +159,7 @@ function createWindow () {
             mainWindow.webContents.send('open-preferences')
           }
         },
+        ...macGeneralMenu,
         {
           type: 'separator'
         },
@@ -180,6 +220,15 @@ function createWindow () {
         }
       ]
     },
+    {
+      label: 'View',
+      submenu: [
+        {
+          label: 'Toggle Full Screen',
+          role: 'togglefullscreen'
+        }
+      ]
+    },
     {
       label: 'Window',
       submenu: [
@@ -213,6 +262,14 @@ function createWindow () {
   const menu = Menu.buildFromTemplate(template)
   Menu.setApplicationMenu(menu)
 
+  /**
+   * Set dock menu for mac
+   */
+  if (process.platform === 'darwin') {
+    const dockMenu = Menu.buildFromTemplate(accountsChange)
+    app.dock.setMenu(dockMenu)
+  }
+
   /**
    * Initial window options
    */
@@ -238,7 +295,6 @@ function createWindow () {
   mainWindow.on('closed', () => {
     mainWindow = null
   })
-    })
 }
 
 // Do not lower the rendering priority of Chromium when background
@@ -247,12 +303,11 @@ app.commandLine.appendSwitch('disable-renderer-backgrounding')
 app.on('ready', createWindow)
 
 app.on('window-all-closed', () => {
+  // this action is called when user click the close button.
+  // In macOS, close button does not shutdown application. It is hide application window.
+  if (process.platform !== 'darwin') {
     app.quit()
-  // This is a single-window application.
+  }
-  // So quit application when main window is closed.
-  // if (process.platform !== 'darwin') {
-  //   app.quit()
-  // }
 })
 
 app.on('activate', () => {