Merge pull request #623 from feross/tray

Fix Windows tray state

main/windows/main.js

@@ -51,15 +51,11 @@ function init () {
     menu.onToggleFullScreen(main.win.isFullScreen())
   })
 
-  win.on('blur', function () {
+  win.on('blur', onWindowBlur)
-    menu.onWindowBlur()
+  win.on('focus', onWindowFocus)
-    tray.onWindowBlur()
-  })
 
-  win.on('focus', function () {
+  win.on('hide', onWindowBlur)
-    menu.onWindowFocus()
+  win.on('show', onWindowFocus)
-    tray.onWindowFocus()
-  })
 
   win.on('enter-full-screen', function () {
     menu.onToggleFullScreen(true)
@@ -207,6 +203,16 @@ function toggleFullScreen (flag) {
   main.win.setFullScreen(flag)
 }
 
+function onWindowBlur () {
+  menu.onWindowBlur()
+  tray.onWindowBlur()
+}
+
+function onWindowFocus () {
+  menu.onWindowFocus()
+  tray.onWindowFocus()
+}
+
 function getIconPath () {
   return process.platform === 'win32'
     ? config.APP_ICON + '.ico'