From 78b199b719d66a1511755d63c2e9ff1b6b477ea8 Mon Sep 17 00:00:00 2001 From: Roman Date: Wed, 14 Oct 2020 18:08:10 +0300 Subject: [PATCH] fix-build: invisible app icon when there are more files within "build/icons/*.png" Signed-off-by: Roman --- build/build_tray_icon.ts | 2 +- build/{icons => tray}/tray_icon.png | Bin build/{icons => tray}/tray_icon@2x.png | Bin build/{icons => tray}/tray_icon@3x.png | Bin build/{icons => tray}/tray_icon_dark.png | Bin build/{icons => tray}/tray_icon_dark@2x.png | Bin build/{icons => tray}/tray_icon_dark@3x.png | Bin package.json | 5 +++-- src/main/tray.ts | 7 ++++++- 9 files changed, 10 insertions(+), 4 deletions(-) rename build/{icons => tray}/tray_icon.png (100%) rename build/{icons => tray}/tray_icon@2x.png (100%) rename build/{icons => tray}/tray_icon@3x.png (100%) rename build/{icons => tray}/tray_icon_dark.png (100%) rename build/{icons => tray}/tray_icon_dark@2x.png (100%) rename build/{icons => tray}/tray_icon_dark@3x.png (100%) diff --git a/build/build_tray_icon.ts b/build/build_tray_icon.ts index 2324f43295..00d09b69bc 100644 --- a/build/build_tray_icon.ts +++ b/build/build_tray_icon.ts @@ -9,7 +9,7 @@ export async function generateTrayIcon( { outputFilename = "tray_icon", // e.g. output tray_icon_dark@2x.png svgIconPath = path.resolve(__dirname, "../src/renderer/components/icon/logo-lens.svg"), - outputFolder = path.resolve(__dirname, "./icons"), + outputFolder = path.resolve(__dirname, "./tray"), dpiSuffix = "2x", pixelSize = 32, shouldUseDarkColors = false, // managed by electron.nativeTheme.shouldUseDarkColors diff --git a/build/icons/tray_icon.png b/build/tray/tray_icon.png similarity index 100% rename from build/icons/tray_icon.png rename to build/tray/tray_icon.png diff --git a/build/icons/tray_icon@2x.png b/build/tray/tray_icon@2x.png similarity index 100% rename from build/icons/tray_icon@2x.png rename to build/tray/tray_icon@2x.png diff --git a/build/icons/tray_icon@3x.png b/build/tray/tray_icon@3x.png similarity index 100% rename from build/icons/tray_icon@3x.png rename to build/tray/tray_icon@3x.png diff --git a/build/icons/tray_icon_dark.png b/build/tray/tray_icon_dark.png similarity index 100% rename from build/icons/tray_icon_dark.png rename to build/tray/tray_icon_dark.png diff --git a/build/icons/tray_icon_dark@2x.png b/build/tray/tray_icon_dark@2x.png similarity index 100% rename from build/icons/tray_icon_dark@2x.png rename to build/tray/tray_icon_dark@2x.png diff --git a/build/icons/tray_icon_dark@3x.png b/build/tray/tray_icon_dark@3x.png similarity index 100% rename from build/icons/tray_icon_dark@3x.png rename to build/tray/tray_icon_dark@3x.png diff --git a/package.json b/package.json index eea0c95166..0f0b70aa57 100644 --- a/package.json +++ b/package.json @@ -90,8 +90,9 @@ "filter": "!**/main.js" }, { - "from": "build/icons/", - "to": "build/icons/" + "from": "build/tray", + "to": "static/icons", + "filter": "*.png" }, "LICENSE" ], diff --git a/src/main/tray.ts b/src/main/tray.ts index 72bbf51874..aec318db70 100644 --- a/src/main/tray.ts +++ b/src/main/tray.ts @@ -10,6 +10,7 @@ import { workspaceStore } from "../common/workspace-store"; import { preferencesURL } from "../renderer/components/+preferences/preferences.route"; import { clusterViewURL } from "../renderer/components/cluster-manager/cluster-view.route"; import logger from "./logger"; +import { isDevelopment } from "../common/vars"; // note: instance of Tray should be saved somewhere, otherwise it disappears export let tray: Tray; @@ -18,7 +19,11 @@ export let tray: Tray; nativeTheme.on("updated", () => tray?.setImage(getTrayIcon())); export function getTrayIcon(isDark = nativeTheme.shouldUseDarkColors): string { - return path.resolve(__static, "../build/icons", `tray_icon${isDark ? "_dark" : ""}.png`) + return path.resolve( + __static, + isDevelopment ? "../build/tray" : "icons", // copied within electron-builder extras + `tray_icon${isDark ? "_dark" : ""}.png` + ) } export function initTray(windowManager: WindowManager) {