diff --git a/bin/tray-icons/build-icons.sh b/bin/tray-icons/build-icons.sh index 517c533ea..9703c2982 100644 --- a/bin/tray-icons/build-icons.sh +++ b/bin/tray-icons/build-icons.sh @@ -23,6 +23,7 @@ function generateDpiScaledIcons { inkscape -w 32 -h 32 "$file" -o "$output_dir/$name@2x.png" } +generateDpiScaledIcons "$images_dir/icon-black.svg" generateDpiScaledIcons "$images_dir/icon-color.svg" generateDpiScaledIcons "$images_dir/icon-purple.svg" diff --git a/images/app-icons/tray/icon-black.png b/images/app-icons/tray/icon-black.png new file mode 100644 index 000000000..dcfda8e63 Binary files /dev/null and b/images/app-icons/tray/icon-black.png differ diff --git a/images/app-icons/tray/icon-black@1.25x.png b/images/app-icons/tray/icon-black@1.25x.png new file mode 100644 index 000000000..25a76c6d5 Binary files /dev/null and b/images/app-icons/tray/icon-black@1.25x.png differ diff --git a/images/app-icons/tray/icon-black@1.5x.png b/images/app-icons/tray/icon-black@1.5x.png new file mode 100644 index 000000000..6bd033e16 Binary files /dev/null and b/images/app-icons/tray/icon-black@1.5x.png differ diff --git a/images/app-icons/tray/icon-black@2x.png b/images/app-icons/tray/icon-black@2x.png new file mode 100644 index 000000000..401c03869 Binary files /dev/null and b/images/app-icons/tray/icon-black@2x.png differ diff --git a/src/services/tray.ts b/src/services/tray.ts index ebfda0eea..424bde013 100644 --- a/src/services/tray.ts +++ b/src/services/tray.ts @@ -11,7 +11,7 @@ import becca_service from "../becca/becca_service.js"; import type BRecentNote from "../becca/entities/brecent_note.js"; import { ipcMain, nativeTheme } from "electron/main"; import { default as i18next, t } from "i18next"; -import { isDev } from "./utils.js"; +import { isDev, isMac } from "./utils.js"; import cls from "./cls.js"; let tray: Tray; @@ -19,21 +19,15 @@ let tray: Tray; // is minimized let isVisible = true; -// Inspired by https://github.com/signalapp/Signal-Desktop/blob/dcb5bb672635c4b29a51adec8a5658e3834ec8fc/app/tray_icon.ts#L20 -function getIconSize() { - switch (process.platform) { - case "darwin": - return 16; - case "win32": - return 32; - default: - return 256; - } -} - function getTrayIconPath() { - const iconSize = getIconSize(); - const name = isDev ? "icon-purple" : "icon-color"; + let name: string; + if (isMac) { + name = "icon-black"; + } else if (isDev) { + name = "icon-purple"; + } else { + name = "icon-color"; + } return path.join(path.dirname(fileURLToPath(import.meta.url)), "../..", "images", "app-icons", "tray", `${name}.png`); }