tray icon colour update.

simon-fraser · Oct 8, 2018 · d06cb65 · d06cb65
1 parent d2520d2
commit d06cb65
Show file tree

Hide file tree

Showing 20 changed files with 5 additions and 5 deletions.
diff --git a/assets/icons/menu-standard-dark-paused.png b/assets/icons/menu-standard-dark-paused.png
diff --git a/assets/icons/menu-standard-dark-paused@2x.png b/assets/icons/menu-standard-dark-paused@2x.png
diff --git a/assets/icons/menu-standard-dark-playing.png b/assets/icons/menu-standard-dark-playing.png
diff --git a/assets/icons/menu-standard-dark-playing@2x.png b/assets/icons/menu-standard-dark-playing@2x.png
diff --git a/assets/icons/menu-standard-dark.png b/assets/icons/menu-standard-dark.png
diff --git a/assets/icons/menu-standard-dark@2x.png b/assets/icons/menu-standard-dark@2x.png
diff --git a/assets/icons/menu-standard-light-paused.png b/assets/icons/menu-standard-light-paused.png
diff --git a/assets/icons/menu-standard-light-paused@2x.png b/assets/icons/menu-standard-light-paused@2x.png
diff --git a/assets/icons/menu-standard-light-playing.png b/assets/icons/menu-standard-light-playing.png
diff --git a/assets/icons/menu-standard-light-playing@2x.png b/assets/icons/menu-standard-light-playing@2x.png
diff --git a/assets/icons/menu-standard-light.png b/assets/icons/menu-standard-light.png
diff --git a/assets/icons/menu-standard-light@2x.png b/assets/icons/menu-standard-light@2x.png
diff --git a/assets/icons/menu-standard-paused.png b/assets/icons/menu-standard-paused.png
diff --git a/assets/icons/menu-standard-paused@2x.png b/assets/icons/menu-standard-paused@2x.png
diff --git a/assets/icons/menu-standard-playing.png b/assets/icons/menu-standard-playing.png
diff --git a/assets/icons/menu-standard-playing@2x.png b/assets/icons/menu-standard-playing@2x.png
diff --git a/assets/icons/menu-standard.png b/assets/icons/menu-standard.png
diff --git a/assets/icons/menu-standard@2x.png b/assets/icons/menu-standard@2x.png
diff --git a/assets/icons/menu.svg b/assets/icons/menu.svg
diff --git a/index.js b/index.js
@@ -10,6 +10,7 @@ let loadingScreen
 let mainWindow
 let aboutScreen
 let tray
+let trayTheme
 let status
 let willQuitApp = false
 let windowParams = {
@@ -135,7 +136,7 @@ function createMenu () {
 }
 
 function trayIcon () {
-  tray = new Tray(path.join(__dirname, 'assets/icons/menu-standard.png'))
+  tray = new Tray(path.join(__dirname, `assets/icons/menu-standard-${trayTheme}.png`))
   tray.setToolTip('MusicTube Player')
   tray.on('click', () => {
     mainWindow.isVisible() ? mainWindow.hide() : mainWindow.show()
@@ -184,6 +185,8 @@ function skipOver () {
 
 // Application ready to run
 app.on('ready', () => {
+  trayTheme = (process.platform === 'darwin') ? 'dark' : 'light'
+
   createLoadingWindow()
   createWindow()
   globalShortcuts()
@@ -213,5 +216,5 @@ ipcMain.on('player', (event, object) => {
     })
   }
   status = JSON.stringify(object)
-  tray.setImage(path.join(__dirname, `assets/icons/menu-standard-${object.status.toLowerCase()}.png`))
+  tray.setImage(path.join(__dirname, `assets/icons/menu-standard-${trayTheme}-${object.status.toLowerCase()}.png`))
 })