Merge pull request #67 from zhusee2/retina-menubar-icon

Fix missing menubar icon and retina support for the icon on OS X
aluxian · May 4, 2015 · a99c0a4 · a99c0a4
2 parents d46c22f + 0ac54f0
commit a99c0a4
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 2 deletions.
diff --git a/src/components/menus.js b/src/components/menus.js
@@ -258,7 +258,7 @@ module.exports = {
    */
   loadTrayIcon: function(win) {
     var tray = new gui.Tray({
-      icon: 'icons/icon_' + (platform.isOSX ? 'menubar' : 'tray') + '.png'
+      icon: 'icons/icon_' + (platform.isOSX ? 'menubar.tiff' : 'tray.png')
     });
 
     tray.on('click', function() {

diff --git a/src/components/window-behaviour.js b/src/components/window-behaviour.js
@@ -122,7 +122,7 @@ module.exports = {
 
       // Update the tray icon too
       if (win.tray) {
-        win.tray.icon = 'icons/icon_' + (platform.isOSX ? 'menubar' : 'tray') + (label ? '_alert' : '') + '.png';
+        win.tray.icon = 'icons/icon_' + (platform.isOSX ? 'menubar' : 'tray') + (label ? '_alert' : '') + (platform.isOSX ? '.tiff' : '.png');
       }
     }, 50);
   },

diff --git a/src/icons/icon_menubar.png b/src/icons/icon_menubar.png
diff --git a/src/icons/icon_menubar.tiff b/src/icons/icon_menubar.tiff
diff --git a/src/icons/icon_menubar_alert.tiff b/src/icons/icon_menubar_alert.tiff
diff --git a/src/icons/icon_menubar_alt.png b/src/icons/icon_menubar_alt.png