From 06568fa232a2f5025901929d5ddc39f970860d86 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Wed, 2 Dec 2020 09:53:50 +0300 Subject: [PATCH] Fixing tray icon color on macOS Big Sur (#1595) * Using trayTemplate icon Signed-off-by: Alex Andreev * Clean up nativeTheme import Signed-off-by: Alex Andreev * Using light icon for tray Signed-off-by: Alex Andreev * Removing unused tray icons Signed-off-by: Alex Andreev --- .../{tray_icon_dark.png => trayIconTemplate.png} | Bin ..._icon_dark@2x.png => trayIconTemplate@2x.png} | Bin ..._icon_dark@3x.png => trayIconTemplate@3x.png} | Bin build/tray/tray_icon.png | Bin 448 -> 0 bytes build/tray/tray_icon@2x.png | Bin 973 -> 0 bytes build/tray/tray_icon@3x.png | Bin 1479 -> 0 bytes src/main/tray.ts | 9 +++------ 7 files changed, 3 insertions(+), 6 deletions(-) rename build/tray/{tray_icon_dark.png => trayIconTemplate.png} (100%) rename build/tray/{tray_icon_dark@2x.png => trayIconTemplate@2x.png} (100%) rename build/tray/{tray_icon_dark@3x.png => trayIconTemplate@3x.png} (100%) delete mode 100644 build/tray/tray_icon.png delete mode 100644 build/tray/tray_icon@2x.png delete mode 100644 build/tray/tray_icon@3x.png diff --git a/build/tray/tray_icon_dark.png b/build/tray/trayIconTemplate.png similarity index 100% rename from build/tray/tray_icon_dark.png rename to build/tray/trayIconTemplate.png diff --git a/build/tray/tray_icon_dark@2x.png b/build/tray/trayIconTemplate@2x.png similarity index 100% rename from build/tray/tray_icon_dark@2x.png rename to build/tray/trayIconTemplate@2x.png diff --git a/build/tray/tray_icon_dark@3x.png b/build/tray/trayIconTemplate@3x.png similarity index 100% rename from build/tray/tray_icon_dark@3x.png rename to build/tray/trayIconTemplate@3x.png diff --git a/build/tray/tray_icon.png b/build/tray/tray_icon.png deleted file mode 100644 index 73c7346d33abfc2e53b2f9a1e3043ba09ba3a5f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 zcmV;x0YCnUP)@aCkc-s@pssQA;?2Y_@g&J;0K0VngPfZs zj0q2k3tX6lGB4TvUo+2Z^|I_8mZOka-L=SB-5b-%r2}?h12$nB8cdSgz)2?cn^RgG zpbJjn01inv^B6Aqs@hD2DIThT-%hct;2)pR4RLys|}_Dw4Q0000p2Uj) diff --git a/build/tray/tray_icon@2x.png b/build/tray/tray_icon@2x.png deleted file mode 100644 index 71206802ac07cfb5dac96338fc0b29dc5a78cb38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 973 zcmV;;12X)HP)`iRvwty-*#-PA`bWTAp!r67pVg#_JL z!JRwNO=|^T2x1j1E`+*Kx)JJ=ZUhk#5kW*j(M?fTA`}F5kv6T3+B|MN6aNXnC-){d z$-vj<&YhX_pEGA3*Kz)p79moGR-sO45ZVH?XPSj&!fIiiQ14JN#=ixJD%nGhz z5$~=d0>6CPn&*^|A;YhPe)9M>+M0JiVLSh44wbG_?$Ut9gFa>4wn?kL&xKtuyhV7R z#>~O#k^)@y+$o&I?-Utk!H6J3b3C1QHCdl%`m)M zc;R8#RZbQJv?0rLYEEsNvfNI`YvnN;(nUvPm2gRzCm|^gDU+{L^7 zH3+Z~yGO~#Temq4mudl7YIGU{G*l_T_8X>U$cNhk=fIrLb{VTdgiXXgp98MsX_%qJ zSzpB}u;Di$ZWq3J9OIs+Vbd;f!qoNPfC&=%0kx#ZkP8dy zv@HlQ9vu^o3xn7`HMah&!bIg9MW=@haSoaCQcY_?Kx-A(Y|TX&`QVXki?A`OBJ*Dk z#OVs23Wz-|Ct&=J@|@>;kFZxQao<%?4i4id7#~!g>!o}_SgF1l%I*VxWaw^a?t(ki zHw3q}LZ3nC6bVRFx(qcj%xxk-+a#`jH&k6D$j2!&3ol3D(c>~7stI7eBen_$(S9B_ vTbv3$&-pXmZaVF_U`A3jP)UIq2$??$ zrf_C3doY0&JrMj+f)P4n1zJXpM5IHcg3}Kp3yrAgfmx9~h%CdPq?+;GIcHj%zExjq z_IciO-0*SlIcM*+*V=2Xz1Lbh2>xj`LA#({0PVqltzH3Ypna_1c$(+m<~mFh+#~1` zbPIYi!1Y@!xCL}h5-h^|tTfW-F9do8O9WR6+5*$s!TeZ341&%bEzn5A*MfUV1Matj z)!v1UBZ6i|j9|=S(0Qf+4Ij-0F}__ej~4p~XlB1)4GYkX0ggzN18&S^p!04)8WD|A z#CdN;I34KR>`dEM-GkKCa-S-gxe-a!im?Zd(zDEgTBl_Po-?s>^C&niWmSP_5 zGmPKWMFkk6iMN8rwT8hcC*#hKW)b733zoxFc+QZd)B7*~3YG6Yb9b3tRH(M%HK&IFzpTtJL>z$yPqU|i|7Bmfg~jGPJ@dx+UM z#t#VkvC7&m5e#@V6DIhRSAgyu8W_dzM;L#unb0!6ANG72F@BX`gPE&o{3MQ#aRRh^ zG!SL5|CcbnlL#~8dj*eUCkb$Z&Jk?#YzSExj}@Se4zflHp@=lF2;*0pKHp={o@h?| z^98%9-$=}vF_u>VJ(@pDa75o0IRj%q!SimM%Ey@Cu13#pv2GK5XiRc6hZe>Opc70L z{9)|e5(;URj}n|L*a06pJc04R^L(q|y#j*73J@Ufu)B%x0NR576EZMvTirant@s_Y zNJ)M%P5>8Y-yk>}&&y&=i3M0{gs%trn;mnL;H?aTcz2-(1@9BF*JGSoO>1@wjHe0W z7IVn6^F>J}bQfN(z`NsU$7mY+cR|~kF?QWba|?MQJzo>E<$5*HO`SUN{z5w1Lt6b0 zg7TX##0!FTf-}saH|Pl@`+cE=+L*@p3p`=Lni9>&no%$2aKYSjf^(>k3;JH6MCw_e z0Qzwca@+tBC&%HP6$qet?iI#lH1O*%f!}5__x}knN;bBY25rW>gMy39q-C0rJH3CP zx!7z5Xm0h>*l1LRSWYROBm4_8uqv7^$Pg{2O@5pyzlta}ND_c!{@W?*T3^BLWBuSU zZ0tA13%1w5QRi z;l^tvI_=BE-~tNle171KM(-|I_I|PjEvOIOZ{jcw(&DVbs{xm2|0wue@MQ*kf!}X% z>7Wd?rNAF~ zZJxAMSNz79nro~HEu<}SqyUB!prx8mDaUv^Cg-+Q?}t5pkhqP872R<;6S>^nrTI!X zD!>r>&hk`761UL?5pETnhTe&}X3%aECY<*BP;;7q|15CJ_XBBn2UgYn36+kd(&bEy zd((`mOaLGA+sSDMJ$9c|{eH;gnAtXgvU0YdzoAaYQ&11*ATxCNKICgsq_5`8r%ftt>##t?rAsL(uZ#TJX0D h%+Eg*xozdN{s!je5-4cpd;S0b002ovPDHLkV1f{0ueSgI diff --git a/src/main/tray.ts b/src/main/tray.ts index 2c5ba736f2..d006ae6b43 100644 --- a/src/main/tray.ts +++ b/src/main/tray.ts @@ -1,6 +1,6 @@ import path from "path"; import packageInfo from "../../package.json"; -import { dialog, Menu, NativeImage, nativeTheme, Tray } from "electron"; +import { dialog, Menu, NativeImage, Tray } from "electron"; import { autorun } from "mobx"; import { showAbout } from "./menu"; import { AppUpdater } from "./app-updater"; @@ -16,14 +16,11 @@ import { exitApp } from "./exit-app"; // note: instance of Tray should be saved somewhere, otherwise it disappears export let tray: Tray; -// refresh icon when MacOS dark/light theme has changed -nativeTheme?.on("updated", () => tray?.setImage(getTrayIcon())); - -export function getTrayIcon(isDark = nativeTheme.shouldUseDarkColors): string { +export function getTrayIcon(): string { return path.resolve( __static, isDevelopment ? "../build/tray" : "icons", // copied within electron-builder extras - `tray_icon${isDark ? "_dark" : ""}.png` + "trayIconTemplate.png" ); }