diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-02-19 10:08:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-19 10:08:26 +0100 |
commit | 5f17faa41f39d049ef030e020ec51c3cddb703e6 (patch) | |
tree | 1d29a0811a4147b5cf6272ed51d1b218cb887ec2 | |
parent | fix(App): Fix issues with disabling launch app on startup (diff) | |
parent | replace icons with high-res icons (diff) | |
download | ferdium-app-5f17faa41f39d049ef030e020ec51c3cddb703e6.tar.gz ferdium-app-5f17faa41f39d049ef030e020ec51c3cddb703e6.tar.zst ferdium-app-5f17faa41f39d049ef030e020ec51c3cddb703e6.zip |
Merge pull request #700 from meetfranz/feature/linux-icons
Invert Linux tray icon color
-rw-r--r-- | src/assets/images/tray/linux/tray-unread.png | bin | 1264 -> 2786 bytes | |||
-rw-r--r-- | src/assets/images/tray/linux/tray-unread@2x.png | bin | 2026 -> 0 bytes | |||
-rw-r--r-- | src/assets/images/tray/linux/tray.png | bin | 1230 -> 2847 bytes | |||
-rw-r--r-- | src/assets/images/tray/linux/tray@2x.png | bin | 1545 -> 0 bytes | |||
-rw-r--r-- | src/lib/Tray.js | 6 |
5 files changed, 3 insertions, 3 deletions
diff --git a/src/assets/images/tray/linux/tray-unread.png b/src/assets/images/tray/linux/tray-unread.png index a94ad81fb..5697141e0 100644 --- a/src/assets/images/tray/linux/tray-unread.png +++ b/src/assets/images/tray/linux/tray-unread.png | |||
Binary files differ | |||
diff --git a/src/assets/images/tray/linux/tray-unread@2x.png b/src/assets/images/tray/linux/tray-unread@2x.png deleted file mode 100644 index 56e74b16a..000000000 --- a/src/assets/images/tray/linux/tray-unread@2x.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/src/assets/images/tray/linux/tray.png b/src/assets/images/tray/linux/tray.png index 583f34df8..29a13da12 100644 --- a/src/assets/images/tray/linux/tray.png +++ b/src/assets/images/tray/linux/tray.png | |||
Binary files differ | |||
diff --git a/src/assets/images/tray/linux/tray@2x.png b/src/assets/images/tray/linux/tray@2x.png deleted file mode 100644 index 479a2cf95..000000000 --- a/src/assets/images/tray/linux/tray@2x.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/src/lib/Tray.js b/src/lib/Tray.js index 2efe71a71..588fa75bf 100644 --- a/src/lib/Tray.js +++ b/src/lib/Tray.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import { app, Tray, Menu, systemPreferences } from 'electron'; | 1 | import { app, Tray, Menu, systemPreferences, nativeImage } from 'electron'; |
2 | import path from 'path'; | 2 | import path from 'path'; |
3 | 3 | ||
4 | const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png'; | 4 | const FILE_EXTENSION = process.platform === 'win32' ? 'ico' : 'png'; |
@@ -78,8 +78,8 @@ export default class TrayIcon { | |||
78 | platform = `${platform}-dark`; | 78 | platform = `${platform}-dark`; |
79 | } | 79 | } |
80 | 80 | ||
81 | return path.join( | 81 | return nativeImage.createFromPath(path.join( |
82 | __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`, | 82 | __dirname, '..', 'assets', 'images', type, platform, `${asset}.${FILE_EXTENSION}`), |
83 | ); | 83 | ); |
84 | } | 84 | } |
85 | } | 85 | } |