From 37c32591718e1ac560e9c512489f89bdd4b46a61 Mon Sep 17 00:00:00 2001
From: MrGarlic1 <61215937+MrGarlic1@users.noreply.github.com>
Date: Mon, 6 May 2024 11:48:05 -0400
Subject: [PATCH] fixed macos tray display bugs

---
 src/main/mainWindow.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/mainWindow.ts b/src/main/mainWindow.ts
index a3e667a..d4add81 100644
--- a/src/main/mainWindow.ts
+++ b/src/main/mainWindow.ts
@@ -121,10 +121,14 @@ function initTray(win: BrowserWindow) {
             }
         }
     ]);
-    tray = new Tray(ICON_PATH);
-    if (Settings.store.trayIconPath) {
-        const trayImage = nativeImage.createFromPath(Settings.store.trayIconPath);
-        if (!trayImage.isEmpty()) tray.setImage(trayImage.resize({ width: 32, height: 32 }));
+    var trayImage = nativeImage.createFromPath(ICON_PATH);
+    if (Settings.store.trayIconPath) trayImage = nativeImage.createFromPath(Settings.store.trayIconPath);
+    if (trayImage.isEmpty()) trayImage = nativeImage.createFromPath(ICON_PATH);
+
+    if (process.platform === "darwin") {
+        tray = new Tray(trayImage.resize({ width: 16, height: 16 }));
+    } else {
+        tray = new Tray(trayImage.resize({ width: 32, height: 32 }));
     }
 
     tray.setToolTip("Vesktop");
@@ -433,7 +437,7 @@ function createMainWindow() {
     if (Settings.store.staticTitle) win.on("page-title-updated", e => e.preventDefault());
 
     initWindowBoundsListeners(win);
-    if (!isDeckGameMode && (Settings.store.tray ?? true) && process.platform !== "darwin") initTray(win);
+    if (!isDeckGameMode && (Settings.store.tray ?? true)) initTray(win);
     initMenuBar(win);
     makeLinksOpenExternally(win);
     initSettingsListeners(win);