From 5534319e936971a2baf835c0b3f50871a11b77f8 Mon Sep 17 00:00:00 2001 From: Kohei TAKATA Date: Sat, 11 Feb 2017 14:05:14 +0900 Subject: [PATCH 1/2] Fix windows taskbar icon --- lib/finder-window.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/finder-window.js b/lib/finder-window.js index 581a77b7..4078a444 100644 --- a/lib/finder-window.js +++ b/lib/finder-window.js @@ -45,13 +45,9 @@ finderWindow.on('close', function (e) { finderWindow.hide() }) -var trayIcon = process.platform === 'darwin' - ? !systemPreferences.isDarkMode() - ? path.join(__dirname, '../resources/tray-icon-default.png') - : path.join(__dirname, '../resources/tray-icon-dark.png') - : process.platform === 'win32' - ? path.join(__dirname, '../resources/tray-icon-dark.png') - : path.join(__dirname, '../resources/tray-icon.png') +var trayIcon = process.platform === 'darwin' || process.platform === 'win32' + ? path.join(__dirname, '../resources/tray-icon-default.png') + : path.join(__dirname, '../resources/tray-icon.png') var appIcon = new Tray(trayIcon) appIcon.setToolTip('Boostnote') if (process.platform === 'darwin') { From 1ae3f295f38dd65fbbee5b3ef4307aff3d659823 Mon Sep 17 00:00:00 2001 From: Kohei TAKATA Date: Sat, 11 Feb 2017 15:47:25 +0900 Subject: [PATCH 2/2] Remove unused variable --- lib/finder-window.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/finder-window.js b/lib/finder-window.js index 4078a444..def6af49 100644 --- a/lib/finder-window.js +++ b/lib/finder-window.js @@ -1,6 +1,5 @@ const electron = require('electron') const { app } = electron -const { systemPreferences } = electron const BrowserWindow = electron.BrowserWindow const Menu = electron.Menu const MenuItem = electron.MenuItem