From 8d85591e1c6cae8f69c8aa78d5fedc4dddc57441 Mon Sep 17 00:00:00 2001 From: smartfrigde <37928912+smartfrigde@users.noreply.github.com> Date: Tue, 14 Jun 2022 16:49:12 +0200 Subject: [PATCH] Change default tray icon for macOS to avoid issues --- assets/16.png | Bin 1134 -> 0 bytes assets/macos.png | Bin 4460 -> 1134 bytes src/tray.ts | 7 ++++++- 3 files changed, 6 insertions(+), 1 deletion(-) delete mode 100644 assets/16.png diff --git a/assets/16.png b/assets/16.png deleted file mode 100644 index f43ff68fd6370e39be7d8a943c4a09c2e57241c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1134 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>SW8zQByM2p6H)IU({5zu02I+RG_!UJcMmG@3@NvBi`O+U%dcw6sy~rf zw6eJCPI1@W+@`ZRji-w`Zx?mmD(bqOTDd17r#7SJP;uAo;_kcAIZN_dE~ZuO%Wu70 z&~_!G_AoF)cMJE`0v+8^666O;DY(G2RdTlb4|}mn_uQUm#mQv9^5(YsXghf}_J&O- zu3TE5BqFHd(SBjKAuF50;)Am01!h?rGh}7X6tum2_wS6|a>?{_C#9w`N%JtT`5nsA zYj|mI&zs^%mF-_|-zs6|PX2ncp2hv~T~7|niI;9Jv3@DFVj9pPj7i?^E=+0MH7P(2 zXMsm#F#`j)FbFd;%$g$s6l5>)^mS!_#>OS0$jKD(5R~p;c)B=-NL)^yFl}Ng1CyIX z!i34;0U=2a9fk%Pt5>XAnQdU;z}ncdY}&TIb@TQ$E)-7m2v-5)Q zD{y`6n^BP*Tzm0Xkxq!^40jEsP( zL)XwC#K^$P*x1UzNZY``%D}*8Qu-1U4Y~O#nQ4`{HTa&t4+>}oPgg&ebxsLQ0MavN Ab^rhX diff --git a/assets/macos.png b/assets/macos.png index 953ecfa160dfcaed2b442d82526c9cc4aab2cbb8..f43ff68fd6370e39be7d8a943c4a09c2e57241c5 100644 GIT binary patch literal 1134 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>SW8zQByM2p6H)IU({5zu02I+RG_!UJcMmG@3@NvBi`O+U%dcw6sy~rf zw6eJCPI1@W+@`ZRji-w`Zx?mmD(bqOTDd17r#7SJP;uAo;_kcAIZN_dE~ZuO%Wu70 z&~_!G_AoF)cMJE`0v+8^666O;DY(G2RdTlb4|}mn_uQUm#mQv9^5(YsXghf}_J&O- zu3TE5BqFHd(SBjKAuF50;)Am01!h?rGh}7X6tum2_wS6|a>?{_C#9w`N%JtT`5nsA zYj|mI&zs^%mF-_|-zs6|PX2ncp2hv~T~7|niI;9Jv3@DFVj9pPj7i?^E=+0MH7P(2 zXMsm#F#`j)FbFd;%$g$s6l5>)^mS!_#>OS0$jKD(5R~p;c)B=-NL)^yFl}Ng1CyIX z!i34;0U=2a9fk%Pt5>XAnQdU;z}ncdY}&TIb@TQ$E)-7m2v-5)Q zD{y`6n^BP*Tzm0Xkxq!^40jEsP( zL)XwC#K^$P*x1UzNZY``%D}*8Qu-1U4Y~O#nQ4`{HTa&t4+>}oPgg&ebxsLQ0MavN Ab^rhX delta 4352 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 diff --git a/src/tray.ts b/src/tray.ts index 6129949..d690914 100644 --- a/src/tray.ts +++ b/src/tray.ts @@ -3,8 +3,13 @@ import {mainWindow} from "./window"; import {getConfig} from "./utils"; import * as path from "path"; import {createSettingsWindow} from "./settings/main"; +import {platform} from "process"; let tray: any = null; +let defaultIcon = "ac_plug_colored"; app.whenReady().then(async () => { + if (platform == "darwin") { + defaultIcon = "macos" + } if ((await getConfig("windowStyle")) == "discord") { tray = new Tray(path.join(__dirname, "../", "/assets/dsc-tray.png")); const contextMenu = Menu.buildFromTemplate([ @@ -25,7 +30,7 @@ app.whenReady().then(async () => { tray.setToolTip("Discord"); tray.setContextMenu(contextMenu); } else { - var trayIcon = (await getConfig("trayIcon")) ?? "ac_plug_colored"; + var trayIcon = (await getConfig("trayIcon")) ?? defaultIcon; tray = new Tray(path.join(__dirname, "../", `/assets/${trayIcon}.png`)); const contextMenu = Menu.buildFromTemplate([ {