fix(monorepo/electron): tray icon

pull/1773/head
Elian Doran 2025-04-24 23:27:01 +07:00
parent 26815842c5
commit 7adafdf56e
No known key found for this signature in database
62 changed files with 4 additions and 5 deletions

@ -25,8 +25,7 @@ module.exports = {
"electron", "electron",
"@electron/remote", "@electron/remote",
"better-sqlite3" "better-sqlite3"
], ]
assets: []
}), }),
new CopyPlugin({ new CopyPlugin({
patterns: [ patterns: [

@ -11,7 +11,7 @@ import cls from "./cls.js";
import date_notes from "./date_notes.js"; import date_notes from "./date_notes.js";
import type { KeyboardActionNames } from "@triliumnext/commons"; import type { KeyboardActionNames } from "@triliumnext/commons";
import optionService from "./options.js"; import optionService from "./options.js";
import { isDev, isMac } from "./utils.js"; import { getResourceDir, isDev, isMac } from "./utils.js";
import windowService from "./window.js"; import windowService from "./window.js";
let tray: Tray; let tray: Tray;
@ -29,12 +29,12 @@ function getTrayIconPath() {
name = "icon-color"; name = "icon-color";
} }
return path.join(path.dirname(fileURLToPath(import.meta.url)), "../..", "images", "app-icons", "tray", `${name}.png`); return path.resolve(path.join(getResourceDir(), "assets", "images", "tray", `${name}.png`));
} }
function getIconPath(name: string) { function getIconPath(name: string) {
const suffix = !isMac && nativeTheme.shouldUseDarkColors ? "-inverted" : ""; const suffix = !isMac && nativeTheme.shouldUseDarkColors ? "-inverted" : "";
return path.join(path.dirname(fileURLToPath(import.meta.url)), "../..", "images", "app-icons", "tray", `${name}Template${suffix}.png`); return path.resolve(path.join(getResourceDir(), "assets", "images", "tray", `${name}Template${suffix}.png`));
} }
function registerVisibilityListener(window: BrowserWindow) { function registerVisibilityListener(window: BrowserWindow) {