From 9748833ba98edf27dbdc77768c805ee346ac9b81 Mon Sep 17 00:00:00 2001 From: Feross Aboukhadijeh Date: Wed, 25 May 2016 16:10:51 -0700 Subject: [PATCH] Use .ico format on Windows - Use .ico format on Windows for best rendering quality, instead of resized .png files --- main/tray.js | 10 ++++++++-- main/windows.js | 10 ++++++++-- static/WebTorrentSmall.png | Bin 3538 -> 0 bytes static/WebTorrentSmaller.png | Bin 1144 -> 0 bytes 4 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 static/WebTorrentSmall.png delete mode 100644 static/WebTorrentSmaller.png diff --git a/main/tray.js b/main/tray.js index ad7132d5..f0b40a99 100644 --- a/main/tray.js +++ b/main/tray.js @@ -4,11 +4,11 @@ module.exports = { } var cp = require('child_process') -var path = require('path') var electron = require('electron') var app = electron.app +var config = require('../config') var windows = require('./windows') var trayIcon @@ -33,7 +33,7 @@ function hasTray () { } function createTrayIcon () { - trayIcon = new electron.Tray(path.join(__dirname, '..', 'static', 'WebTorrentSmall.png')) + trayIcon = new electron.Tray(getIconPath()) // On Windows, left click to open the app, right click for context menu // On Linux, any click (right or left) opens the context menu @@ -79,3 +79,9 @@ function hideApp () { windows.main.hide() windows.main.send('dispatch', 'backToList') } + +function getIconPath () { + return process.platform === 'win32' + ? config.APP_ICON + '.ico' + : config.APP_ICON + '.png' +} diff --git a/main/windows.js b/main/windows.js index 4d74f6ac..62e15aa6 100644 --- a/main/windows.js +++ b/main/windows.js @@ -24,7 +24,7 @@ function createAboutWindow () { show: false, center: true, resizable: false, - icon: config.APP_ICON + '.png', + icon: getIconPath(), title: process.platform !== 'darwin' ? 'About ' + config.APP_WINDOW_TITLE : '', @@ -91,7 +91,7 @@ function createMainWindow () { var win = windows.main = new electron.BrowserWindow({ backgroundColor: '#1E1E1E', darkTheme: true, // Forces dark theme (GTK+3) - icon: config.APP_ICON + 'Smaller.png', // Window and Volume Mixer icon. + icon: getIconPath(), // Window icon (Windows, Linux) minWidth: config.WINDOW_MIN_WIDTH, minHeight: config.WINDOW_MIN_HEIGHT, show: false, // Hide window until renderer sends 'ipcReady' event @@ -137,3 +137,9 @@ function focusWindow (win) { } win.show() // shows and gives focus } + +function getIconPath () { + return process.platform === 'win32' + ? config.APP_ICON + '.ico' + : config.APP_ICON + '.png' +} diff --git a/static/WebTorrentSmall.png b/static/WebTorrentSmall.png deleted file mode 100644 index d5cfecc5c79464e36d1188e406a8264d2c7be630..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3538 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 GMgI@!|91!g diff --git a/static/WebTorrentSmaller.png b/static/WebTorrentSmaller.png deleted file mode 100644 index 0389bec289042af828c5e68dc43ff29e1bfae269..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1144 zcmV-;1c&>HP)hV^I?S(oY`I10YcnGgGN<2Hq5~a{~+l)M3HHNnl@;#M3Kt zy9wC|G(UHyQhgNo8+c$!F!*FCoqu9Mmv+ zLBNDIoKlW?JOD!os#dbgXd({=egqCjN&IOsS62jb~C8rvW!R zvC8xgE78r}?awq>^Pf?txXB6*gc)fUs_jU?HPyV;36^r>8Sqr55zXKEsCdcs^*TQd zglMVyZ^Zxx7agwXJjBU)r_zzAcHa2pHgvAmdNrmyc4L z2oU_?4XdLT2(LF!U4~QDM{g0 z97OP)Yp^GsUITDhj;K}C1RMx6K35LeOz??aWM6uLns+_l6Pi9k0IvlZBR-^IQVwMo zd*4Y*0?T%)t7HZk4>M{@HB6UYA!~72<*}A-^nx*?8TJC(MHOc8xbhHM>5kX&uuwc7 zT*(#@tQe;?1hyMEv(qTvO+)q?jcYFcZz6)hD~8ZPfcJh4um#3~G83iE+^+^P_yoA? zU!HKiELnYFo-9k7mP~M~3ON#NViU3}OSUei^x{&T+fvIOJ;a@|gvH}JnbQA-E$`)F zazY#8&JUAAQ4)XF*TbX@2?^{5-UsBgfLFo{2^>rVuJWt8dki=pC9&%S-mw!F7P=^j zKLD-;PF&+ze5Vocb|c_w&mwRf7>Sbj