From d6c7c772ab7ffbcda7b7d430dab3c9075dcf4c0e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 18 Jan 2016 13:55:32 -0800 Subject: [PATCH] force 2x tray icon depending on scaleFactor --- console/resources/console-tray.png | Bin 2450 -> 1560 bytes console/resources/console-tray@2x.png | Bin 4359 -> 2450 bytes console/src/main.js | 16 ++++++++++++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/console/resources/console-tray.png b/console/resources/console-tray.png index 7295647c2052386749c3a594b66f37a380fc295b..6ff889828cf835da2c386fbdaf9b8f19ca6f5f4a 100644 GIT binary patch delta 768 zcmV+b1ONPz6POGkiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVX+}A0th!l zL^LotFf)_j0veNU0vZT6Lqs$%IWRPnkOEHuF_Yi|I{`A2kOCQ#H3LC^2q||60007p zNkl(!V@!mgqR^5y0kvC6lR+0jD^h9<$&yLp&<;`z1xc|1aR`NO z3hg9F?2;`*#zHA*iGzhC5;cSnglH*sivRIX(AT?<`YA zRoK56u)e+yMD7SzS66UxaRFEWv&q+NHp?$BFW(^9+)KON4&xw}v)Qa@Z)|M9=H@2g zG{ifK!GsPT6FfqH+)6;?B$G)f7K?z~un|-FboT*m&^5uVqs!p0#KH`)9Ku&AGuuaUMZ8z$!BeC?JMd;L1Gh^3H#(178X9B z2Hq|$Eh%Z4{*8()Q#zf7larGk?oABK->y_DUAB!noeo;97MnFygQ|R{)oNd({T$Cj yQZ~Ny2hWcu>+9>?olb{Migw|z00RIvJ#>b0N+#9-0000Pj>K delta 1665 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 AV*mgE diff --git a/console/src/main.js b/console/src/main.js index c75ce4cc34..28fe76a55e 100644 --- a/console/src/main.js +++ b/console/src/main.js @@ -115,9 +115,6 @@ const configPath = path.join(getApplicationDataDirectory(), 'config.json'); var userConfig = new Config(); userConfig.load(configPath); -const TRAY_FILENAME = (osType == "Darwin" ? "console-tray-Template.png" : "console-tray.png"); -const TRAY_ICON = path.join(__dirname, '../resources/' + TRAY_FILENAME); - // print out uncaught exceptions in the console process.on('uncaughtException', function(err) { console.error(err); @@ -516,8 +513,19 @@ app.on('ready', function() { app.dock.hide(); } + var trayFilename = null; + + if (osType == "Darwin") { + trayFilename = "console-tray-Template.png"; + } else { + const scaleFactor = require('screen').getPrimaryDisplay().scaleFactor + trayFilename = (scaleFactor > 1 ? "console-tray@2x.png" : "console-tray.png"); + } + + const trayIcon = path.join(__dirname, '../resources/' + trayFilename); + // Create tray icon - tray = new Tray(TRAY_ICON); + tray = new Tray(trayIcon); tray.setToolTip('High Fidelity Server Console'); tray.on('click', function() {