diff --git a/console/resources/console-tray.png b/console/resources/console-tray.png index 7295647c20..6ff889828c 100644 Binary files a/console/resources/console-tray.png and b/console/resources/console-tray.png differ diff --git a/console/resources/console-tray@2x.png b/console/resources/console-tray@2x.png index 5f04aadf79..7295647c20 100644 Binary files a/console/resources/console-tray@2x.png and b/console/resources/console-tray@2x.png differ 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() {