fix(system-tray): rename icon files for Windows and Linux

This commit is contained in:
mbilker 2016-02-26 11:23:53 -05:00
parent ce7d731816
commit 38dce709e2
5 changed files with 9 additions and 9 deletions

View file

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View file

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View file

@ -16,7 +16,7 @@ const TRAY_ICON_PATH = path.join(
NylasEnv.getConfigDirPath(), NylasEnv.getConfigDirPath(),
'tray', 'tray',
'tray-icon.png' 'tray-icon.png'
) );
class SystemTrayIconStore { class SystemTrayIconStore {
@ -31,11 +31,11 @@ class SystemTrayIconStore {
} }
activate() { activate() {
const iconDir = path.dirname(TRAY_ICON_PATH) const iconDir = path.dirname(TRAY_ICON_PATH);
mkdirpAsync(iconDir).then(()=> { mkdirpAsync(iconDir).then(()=> {
writeFile(TRAY_ICON_PATH, this._icon.toPng()) writeFile(TRAY_ICON_PATH, this._icon.toPng())
.then(()=> { .then(()=> {
ipcRenderer.send('update-system-tray', TRAY_ICON_PATH, this._unreadString) ipcRenderer.send('update-system-tray', TRAY_ICON_PATH, this._unreadString);
this._unsubscribe = UnreadBadgeStore.listen(this._onUnreadCountChanged); this._unsubscribe = UnreadBadgeStore.listen(this._onUnreadCountChanged);
}) })
}); });
@ -43,7 +43,7 @@ class SystemTrayIconStore {
_getIconImg(unreadString = this._unreadString) { _getIconImg(unreadString = this._unreadString) {
const imgHandlers = { const imgHandlers = {
'darwin': ()=> { 'darwin': () => {
const img = new Image(); const img = new Image();
let canvas = null; let canvas = null;
@ -62,7 +62,7 @@ class SystemTrayIconStore {
const outputImg = nativeImage.createFromBuffer(pngData); const outputImg = nativeImage.createFromBuffer(pngData);
return outputImg; return outputImg;
}, },
'default': ()=> { 'default': () =>
return unreadString !== '0' ? this._unreadIcon : this._baseIcon; return unreadString !== '0' ? this._unreadIcon : this._baseIcon;
}, },
}; };
@ -70,13 +70,13 @@ class SystemTrayIconStore {
return imgHandlers[this._platform in imgHandlers ? this._platform : 'default'](); return imgHandlers[this._platform in imgHandlers ? this._platform : 'default']();
} }
_onUnreadCountChanged = ()=> { _onUnreadCountChanged = () => {
this._unreadString = (+UnreadBadgeStore.count()).toLocaleString(); this._unreadString = (+UnreadBadgeStore.count()).toLocaleString();
this._icon = this._getIconImg(); this._icon = this._getIconImg();
writeFile(TRAY_ICON_PATH, this._icon.toPng()) writeFile(TRAY_ICON_PATH, this._icon.toPng())
.then(()=> { .then(() => {
ipcRenderer.send('update-system-tray', TRAY_ICON_PATH, this._unreadString) ipcRenderer.send('update-system-tray', TRAY_ICON_PATH, this._unreadString);
}) });
}; };
deactivate() { deactivate() {