From 9f3140db773a9185dc65eb5bfe9b127003de5ff0 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 6 Jun 2022 17:46:55 -0400 Subject: [PATCH] Use alternative icons on non macos Signed-off-by: Sebastian Malton --- src/main/tray/tray-icon-path.injectable.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/tray/tray-icon-path.injectable.ts b/src/main/tray/tray-icon-path.injectable.ts index c7df718d12..34052124cb 100644 --- a/src/main/tray/tray-icon-path.injectable.ts +++ b/src/main/tray/tray-icon-path.injectable.ts @@ -6,6 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import getAbsolutePathInjectable from "../../common/path/get-absolute-path.injectable"; import staticFilesDirectoryInjectable from "../../common/vars/static-files-directory.injectable"; import isDevelopmentInjectable from "../../common/vars/is-development.injectable"; +import isMacInjectable from "../../common/vars/is-mac.injectable"; const trayIconPathsInjectable = getInjectable({ id: "tray-icon-paths", @@ -14,14 +15,16 @@ const trayIconPathsInjectable = getInjectable({ const getAbsolutePath = di.inject(getAbsolutePathInjectable); const staticFilesDirectory = di.inject(staticFilesDirectoryInjectable); const isDevelopment = di.inject(isDevelopmentInjectable); + const isMac = di.inject(isMacInjectable); const baseIconDirectory = getAbsolutePath( staticFilesDirectory, isDevelopment ? "../build/tray" : "icons", // copied within electron-builder extras ); + const fileSuffix = isMac ? "Template.png" : ".png"; return { - normal: getAbsolutePath(baseIconDirectory, "trayIconTemplate.png"), - updateAvailable: getAbsolutePath(baseIconDirectory, "trayIconUpdateAvailableTemplate.png"), + normal: getAbsolutePath(baseIconDirectory, `trayIcon${fileSuffix}`), + updateAvailable: getAbsolutePath(baseIconDirectory, `trayIconUpdateAvailable${fileSuffix}`), }; }, });