From ddb277e8e5be8ef815e8a748c4ad59c72c38f746 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 1 Feb 2025 12:53:11 +0200 Subject: [PATCH] feat(tray): use template for main icon --- bin/tray-icons/build-icons.sh | 5 +++-- .../tray/{icon-black.png => icon-blackTemplate.png} | Bin ...black@1.25x.png => icon-blackTemplate@1.25x.png} | Bin ...n-black@1.5x.png => icon-blackTemplate@1.5x.png} | Bin ...{icon-black@2x.png => icon-blackTemplate@2x.png} | Bin src/services/tray.ts | 2 +- 6 files changed, 4 insertions(+), 3 deletions(-) rename images/app-icons/tray/{icon-black.png => icon-blackTemplate.png} (100%) rename images/app-icons/tray/{icon-black@1.25x.png => icon-blackTemplate@1.25x.png} (100%) rename images/app-icons/tray/{icon-black@1.5x.png => icon-blackTemplate@1.5x.png} (100%) rename images/app-icons/tray/{icon-black@2x.png => icon-blackTemplate@2x.png} (100%) diff --git a/bin/tray-icons/build-icons.sh b/bin/tray-icons/build-icons.sh index 9703c2982..893796746 100644 --- a/bin/tray-icons/build-icons.sh +++ b/bin/tray-icons/build-icons.sh @@ -16,14 +16,15 @@ output_dir="$images_dir/app-icons/tray" function generateDpiScaledIcons { file=$1 - name=$(basename $file .svg) + suffix=$2 + name="$(basename $file .svg)$suffix" inkscape -w 16 -h 16 "$file" -o "$output_dir/$name.png" inkscape -w 20 -h 20 "$file" -o "$output_dir/$name@1.25x.png" inkscape -w 24 -h 24 "$file" -o "$output_dir/$name@1.5x.png" inkscape -w 32 -h 32 "$file" -o "$output_dir/$name@2x.png" } -generateDpiScaledIcons "$images_dir/icon-black.svg" +generateDpiScaledIcons "$images_dir/icon-black.svg" "Template" 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-blackTemplate.png similarity index 100% rename from images/app-icons/tray/icon-black.png rename to images/app-icons/tray/icon-blackTemplate.png diff --git a/images/app-icons/tray/icon-black@1.25x.png b/images/app-icons/tray/icon-blackTemplate@1.25x.png similarity index 100% rename from images/app-icons/tray/icon-black@1.25x.png rename to images/app-icons/tray/icon-blackTemplate@1.25x.png diff --git a/images/app-icons/tray/icon-black@1.5x.png b/images/app-icons/tray/icon-blackTemplate@1.5x.png similarity index 100% rename from images/app-icons/tray/icon-black@1.5x.png rename to images/app-icons/tray/icon-blackTemplate@1.5x.png diff --git a/images/app-icons/tray/icon-black@2x.png b/images/app-icons/tray/icon-blackTemplate@2x.png similarity index 100% rename from images/app-icons/tray/icon-black@2x.png rename to images/app-icons/tray/icon-blackTemplate@2x.png diff --git a/src/services/tray.ts b/src/services/tray.ts index 424bde013..9e89214a2 100644 --- a/src/services/tray.ts +++ b/src/services/tray.ts @@ -22,7 +22,7 @@ let isVisible = true; function getTrayIconPath() { let name: string; if (isMac) { - name = "icon-black"; + name = "icon-blackTemplate"; } else if (isDev) { name = "icon-purple"; } else {