From c13afa3745bb7a02f90fe768dd613dd94481ee24 Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Thu, 25 Feb 2016 22:21:28 +0900
Subject: [PATCH] Show a dot on tray icon to notify unread messages

Tray icon is too small to show a number.
So a dot(small circle) is used.
---
 src/browser/index.jsx          |   6 ++++--
 src/main.js                    |  15 ++++++++++++++-
 src/resources/tray_mention.png | Bin 0 -> 735 bytes
 src/resources/tray_unread.png  | Bin 0 -> 715 bytes
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 src/resources/tray_mention.png
 create mode 100644 src/resources/tray_unread.png

diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index a1097c75..059da87a 100644
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -321,7 +321,9 @@ var showUnreadBadgeWindows = function(unreadCount, mentionCount) {
     // https://github.com/atom/electron/issues/4011
     electron.ipcRenderer.send('win32-overlay', {
       overlayDataURL: dataURL,
-      description: description
+      description: description,
+      unreadCount: unreadCount,
+      mentionCount: mentionCount
     });
   };
 
@@ -332,7 +334,7 @@ var showUnreadBadgeWindows = function(unreadCount, mentionCount) {
     const dataURL = badge.createDataURL('•');
     sendBadge(dataURL, 'You have unread channels');
   } else {
-    remote.getCurrentWindow().setOverlayIcon(null, '');
+    sendBadge(null, 'You have no unread messages');
   }
 }
 
diff --git a/src/main.js b/src/main.js
index 8dd38c02..f2a1b0f1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -104,9 +104,22 @@ app.on('ready', function() {
     });
 
     // Set overlay icon from dataURL
+    // Set trayicon to show "dot"
     ipc.on('win32-overlay', function(event, arg) {
-      var overlay = electron.nativeImage.createFromDataURL(arg.overlayDataURL);
+      const overlay = arg.overlayDataURL ? electron.nativeImage.createFromDataURL(arg.overlayDataURL) : null;
       mainWindow.setOverlayIcon(overlay, arg.description);
+
+      var tray_image = null;
+      if (arg.mentionCount > 0) {
+        tray_image = 'tray_mention.png';
+      }
+      else if (arg.unreadCount > 0) {
+        tray_image = 'tray_unread.png';
+      }
+      else {
+        tray_image = 'tray.png';
+      }
+      trayIcon.setImage(path.resolve(__dirname, 'resources', tray_image));
     });
   }
 
diff --git a/src/resources/tray_mention.png b/src/resources/tray_mention.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a3ee1a99deac1d2a9cfbd85c85e118eccd618d5
GIT binary patch
literal 735
zcmV<50wDc~P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10$fQ%K~y-6byL4fTTvALZctDnt)M8B3c6?!oN6!*!D2HM!68(k
zgub;zI$9x9hXjHd1mof#kf8wwSBEYVs73|5lp3GaCKe%TlhCImeLwEkA@7A}v}ZZ@
za?bbN^PO{#fNdn(gb=2Eo{~}qJs!`X9sUX6vk+ptHMa@2y-!NH&;OVm^SLo@@SH2x
zC=?2MsZ=sZ8YFewJ2ux!;&URJrs;`9g0WbP)oPW7VX#;%k|a&j)LkULrUa+#o0}Uw
z5D0K<Ypa<RjYhe)wnmc7WHP+Ey3!pv&g)Z7+3|RssZ^?QF$^Y?Ndn-~(h^B>XJ?1Y
z%gc1hnSy0magr>T%Q^s_ot=>+H#Rm1fWyPXoS2xPrfDR}a5&7%%S)XkEz62|01N^^
zsZ<gG(ACui08mxcsSvqb4)uB+PW<BHLfGnuU|Ck0B#(}c3;<MBl_Yt5e9V!N5dvUp
zb(PWCd43!VP<b@K_b*<_^J0;fWu==EDwT>3fGaC2%?4JhRqpNP_+iw~THiF;A0+#O
zto2QEan#R)-M!SECa$lq696|iH))z?V+ynLcff9v*8|UX+k_C?Qpy7%#JHj;MmC#m
z4~0Td6a_OgGtj@CphNVa)jEU+z1Lc|up2cFU>^W(Z*PrsI^DjoumAvf)6tJlkH_v2
z06^r=_q>OV#W(;k4**`Tw>=Vxn3YP!$mjEB@8omVDer;nlu%{uv~?fGN$$D6E6)o>
zE<VsirSr*2C-Bsn=R@oK62K4ud_6q;od~`4_grh;0PsWBPQUyuzpDYi{sH!^MIlla
RECK)k002ovPDHLkV1lhzK-T~O

literal 0
HcmV?d00001

diff --git a/src/resources/tray_unread.png b/src/resources/tray_unread.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b2a7ea5b27ea440428b7f38b4a57ea76008c0e9
GIT binary patch
literal 715
zcmV;+0yO=JP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10!T?jK~y-6byH1i6HydBZ)|BxgA^=?;G(6F{DFqL30>$yDk7y3
zq&Qm*w7Xi#PDvo7i-76EEZn#ZWRYzbZc4#^7_qoAj3y?Hg=sMv$Y9c$$s8A%7p9F~
zc)Xdp_uO~RnRf-eAUPt0aJ=V5*LCkHiZbJ+e**X*gxI}WI{<ro*md1c{7-nfupi?G
zM}4(+tyZ&iUAIZvBrR{35xv?ZEHmwP+e)QUOe7LC41>09vtF;0Bpt`Gd`-dw36i#H
znpPwd;m*#^pei1Zb9;N6B$?0Wd47IwNjdWLMM*oEOfs9z_Frt9TU%QMz|GA~lH~sW
zKGW$meR3Aj>-CZ(*=#l~0IXK4B*{XdKmZH|gIrixV7uKWNv^K0^6c!)BFSE_mrwxA
z0D!LR0ssPm002PKG|3Q$hll8PyO8<Q(^KK8pH-v}LiE2Gh5-PGMxzLYLeMk~Z?aja
z=?p?IU*UbTgY~!XuAMX*eV~-kYPBo?%w#eH0}aFA!O;=t)?W~n4)KfqRq1eUZG#7;
zQudOGxm=C_SS%LlI1Wkj{zm*V*w^Id!<B;(A;hlhx+NjRysE19-rnBm^71lNRmIZM
z62AVifU$85#n?FXsp%<c)V!o^nx-Y003aSc89rUEr_aAB><>l>z+(WIoSYnu#bQpY
z)w0XwvJ<&AO<Z(`8C-NBs#@jhJj|0k@?BTfPEI(twlQQPR@Cp9n7A$f=fB4JE`V78
x_;P&w`@!qf9sT-^DF6_)9~FN7_zay+<1c;TNKaX-JmdfX002ovPDHLkV1kxCLLmSE

literal 0
HcmV?d00001