From ce778afff6eb56d7ba54b58768053b49b92111a3 Mon Sep 17 00:00:00 2001
From: Revincx <revincx233@gmail.com>
Date: Wed, 5 Oct 2022 15:23:11 +0800
Subject: [PATCH] feat: Tray icon theme now follows system theme

---
 public/img/icons/menu-dark@88.png                | Bin 0 -> 1096 bytes
 .../img/icons/{menu@88.png => menu-light@88.png} | Bin
 src/electron/tray.js                             |   7 +++++--
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 public/img/icons/menu-dark@88.png
 rename public/img/icons/{menu@88.png => menu-light@88.png} (100%)

diff --git a/public/img/icons/menu-dark@88.png b/public/img/icons/menu-dark@88.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2feb00833cad8a136aeb2f031a7b4cd48c641ed
GIT binary patch
literal 1096
zcmV-O1h@N%P)<h;3K|Lk000e1NJLTq003A3003AB1^@s6ag{JM000CJNkl<ZcmeI4
z*^$&R5QdxMfj5>6AOau)AOau)AOau(js!RoU?BqFkr$2xC?eoUfFl8*z8d$g*Jbat
zJhsm6swvqTS(ZNkZtJo|+?;?DZ~{)i2{-{K-~^n26L10x6F9MOe*Nsui^!gcXxRVn
ztcaZJM?~2EB_e+Y=lS046YBOLNj|&4d?+FxM1;!xEAU6zA9bS0hAawwT_DVD0@%+1
z^sR!`x(zV@b0<>AB!)Y%6tadi)HSNL1Xl$T4f5@Vl&f$xT-{ypK>OA(V0<#IC9|C}
zr`#lbCL&h@kEtp784=<4&RVIEj)tn&ns?3V=p_BNRPdxFQJ1D=<qk3N95Pu5;OnLw
z+el;<TL@rWgxiL|MJtF9A52rl?T~<pomIiE-b1juWn$uh6<2s@Y7bihho8RwBOGuJ
z*Vw9H)76?;p^qYRO++qq;hUNH#6FB!nZ<0a0UpLR#*FjjKIUQSY*-aM24RV~=M$N{
z>=gZY;{RfzQv=@CpJ#py*YT<tqJx5_20SRv=q|Ip+>UojnE4&npaj5L=Dyq5rhGjn
zc~}x)g@xO=T#DN$5ip?DZ2&s!1tX;bRyBX=9)j8W=h6WyX#6vsmF!v@wE*tB4Vrb?
zxQ&_stD1oe<Sg7qjer%jx{aycqNZCltQj!iQ1iV`(Mbl8Y6q<91oTZ2xvvqi!d3t)
zPZrKZ9YAUgFrcHliWUK{IeDOW%0bu~V5Ztl1LX&VcHC$QFzd;l#9py}ddCY?!r`cv
zrA{wWymL`IV0v_bHLoRGS~0b{2;2eV#$Qvy<zm&QV10<;YooRnrj%ccf&t5L<@?Sh
zWC6Dp1>+7LbYl)vLP{22vWq~qce~ejvr+8uN|p#%n_Z|jS?gd3a%#Ucz_^2_u{#S>
z@GSAA07kXEX^Bh7)*Xxi&mFM3gCxDMF<_x_sR19i3_p1<EEMKg`qb@UZh1iVO?zRV
zOL&O&3qH1ORq$GC!SJVa4wz;5AtJmU1@z;TJywqtai*mKsR089n0#HNN=xk`s)X9F
zlojw=E}~zS(zZ=Z9Ps?hY646<(`x=I?NL%Dc2)(GwdtvOv<%hmv2504A%H)ba%>|J
zO-hr60Oo~3w+#V4#J9N7DJb=miTc&3B|=`1G!Hn1D43^a(xsq_OJ-h%tfDuyAm(Jx
zm1CxM2_=-62X$ZFE{Vv`1|k2AIYz?zE>2jY3g?uWx<*~o#%;n0TTn7}j1E`*5F=su
zrCQZY-EfJ?jVoLWXvBhQS$egznflWKXSpFFSGs|7uDrRu7;ug?k}?cH(~I8fTM=2T
zQ?)eUvC8Z01h8`f-XB-#Z;zGV<D7sKZ~{)i2{-{K-~^n26L11~5%>=;&dM0wM)a%z
O0000<MNUMnLSTZenEWUJ

literal 0
HcmV?d00001

diff --git a/public/img/icons/menu@88.png b/public/img/icons/menu-light@88.png
similarity index 100%
rename from public/img/icons/menu@88.png
rename to public/img/icons/menu-light@88.png
diff --git a/src/electron/tray.js b/src/electron/tray.js
index ba74d3c..ed314f2 100644
--- a/src/electron/tray.js
+++ b/src/electron/tray.js
@@ -1,6 +1,6 @@
 /* global __static */
 import path from 'path';
-import { app, nativeImage, Tray, Menu } from 'electron';
+import { app, nativeImage, Tray, Menu, nativeTheme } from 'electron';
 import { isLinux } from '@/utils/platform';
 
 function createMenuTemplate(win) {
@@ -197,8 +197,11 @@ class YPMTrayWindowsImpl {
 }
 
 export function createTray(win, eventEmitter) {
+  // 感觉图标颜色应该不属于界面主题范畴，只需要跟随系统主题
+  let iconTheme = nativeTheme.shouldUseDarkColors ? 'light' : 'dark';
+
   let icon = nativeImage
-    .createFromPath(path.join(__static, 'img/icons/menu@88.png'))
+    .createFromPath(path.join(__static, `img/icons/menu-${iconTheme}@88.png`))
     .resize({
       height: 20,
       width: 20,