Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(desktop): use macOS tray template icon

tianma-ifd204eacf9d76
diff --git a/apps/desktop/assets/trayTemplate.png b/apps/desktop/assets/trayTemplate.png
new file mode 100644
index 00000000..c3768f74
Binary files /dev/null and b/apps/desktop/assets/trayTemplate.png differ
diff --git a/apps/desktop/assets/trayTemplate.svg b/apps/desktop/assets/trayTemplate.svg
new file mode 100644
index 00000000..6631afbd
--- /dev/null
+++ b/apps/desktop/assets/trayTemplate.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+ <path
+ fill="#000"
+ fill-rule="evenodd"
+ d="M9 2h14a6 6 0 0 1 6 6v16a6 6 0 0 1-6 6H9a6 6 0 0 1-6-6V8a6 6 0 0 1 6-6Zm2 7h12v4h-8v2h7v4h-7v2h8v4H11V9Z"
+ />
+</svg>
diff --git a/apps/desktop/assets/[email protected] b/apps/desktop/assets/[email protected]
new file mode 100644
index 00000000..9b99edaa
Binary files /dev/null and b/apps/desktop/assets/[email protected] differ
diff --git a/apps/desktop/electron-builder.yml b/apps/desktop/electron-builder.yml
index d3d5292f..333f1583 100644
--- a/apps/desktop/electron-builder.yml
+++ b/apps/desktop/electron-builder.yml
@@ -29,6 +29,11 @@ extraResources:
to: web
filter:
- "**/*"
+ - from: assets
+ to: tray
+ filter:
+ - "trayTemplate.png"
- from: ../../migrations
to: migrations
filter:
diff --git a/apps/desktop/src/main/index.mjs b/apps/desktop/src/main/index.mjs
index b9691147..951f27ab 100644
--- a/apps/desktop/src/main/index.mjs
+++ b/apps/desktop/src/main/index.mjs
@@ -19,6 +19,7 @@ import {
import { userDataDirectoryFromArguments } from "./user-data-directory.mjs";
import { isAllowedPrintPreviewUrl } from "./window-open-policy.mjs";
import { showWindow } from "./window-visibility.mjs";
+import { trayIconPath } from "./tray-icon.mjs";
import electronUpdater from "electron-updater";
const { autoUpdater } = electronUpdater;
@@ -289,10 +290,14 @@ const buildApplicationMenu = () => {
};
const createTray = () => {
- const iconPath = app.isPackaged
- ? join(process.resourcesPath, "web", "pwa-192x192.png")
- : join(projectRoot, "apps/web/public/pwa-192x192.png");
+ const iconPath = trayIconPath({
+ isPackaged: app.isPackaged,
+ platform: process.platform,
+ projectRoot,
+ resourcesPath: process.resourcesPath,
+ });
const icon = existsSync(iconPath) ? nativeImage.createFromPath(iconPath) : nativeImage.createEmpty();
+ if (process.platform === "darwin") icon.setTemplateImage(true);
tray = new Tray(icon);
tray.setToolTip("EdgeEver");
tray.setContextMenu(Menu.buildFromTemplate([
diff --git a/apps/desktop/src/main/tray-icon.mjs b/apps/desktop/src/main/tray-icon.mjs
new file mode 100644
index 00000000..58c17381
--- /dev/null
+++ b/apps/desktop/src/main/tray-icon.mjs
@@ -0,0 +1,18 @@
+import { join } from "node:path";
+
+export const trayIconPath = ({
+ isPackaged,
+ platform,
+ projectRoot,
+ resourcesPath,
+}) => {
+ if (platform === "darwin") {
+ return isPackaged
+ ? join(resourcesPath, "tray", "trayTemplate.png")
+ : join(projectRoot, "apps/desktop/assets/trayTemplate.png");
+ }
+
+ return isPackaged
+ ? join(resourcesPath, "web", "pwa-192x192.png")
+ : join(projectRoot, "apps/web/public/pwa-192x192.png");
+};
diff --git a/apps/desktop/src/main/tray-icon.test.mjs b/apps/desktop/src/main/tray-icon.test.mjs
new file mode 100644
index 00000000..1eedd6a7
--- /dev/null
+++ b/apps/desktop/src/main/tray-icon.test.mjs
@@ -0,0 +1,49 @@
+import { describe, expect, test } from "bun:test";
+import { fileURLToPath } from "node:url";
+import sharp from "sharp";
+import { trayIconPath } from "./tray-icon.mjs";
+
+describe("trayIconPath", () => {
+ test("uses the macOS template icon during development", () => {
+ expect(trayIconPath({
+ isPackaged: false,
+ platform: "darwin",
+ projectRoot: "/project",
+ resourcesPath: "/resources",
+ })).toBe("/project/apps/desktop/assets/trayTemplate.png");
+ });
+
+ test("uses the packaged macOS template icon", () => {
+ expect(trayIconPath({
+ isPackaged: true,
+ platform: "darwin",
+ projectRoot: "/project",
+ resourcesPath: "/resources",
+ })).toBe("/resources/tray/trayTemplate.png");
+ });
+
+ test("keeps the existing cross-platform icon outside macOS", () => {
+ expect(trayIconPath({
+ isPackaged: true,
+ platform: "win32",
+ projectRoot: "/project",
+ resourcesPath: "/resources",
+ })).toBe("/resources/web/pwa-192x192.png");
+ });
+
+ test.each([
+ ["trayTemplate.png", 16, 72],
+ ["[email protected]", 32, 144],
+ ])("%s is a correctly sized transparent PNG", async (name, size, density) => {
+ const path = fileURLToPath(new URL(`../../assets/${name}`, import.meta.url));
+ const metadata = await sharp(path).metadata();
+
+ expect(metadata).toMatchObject({
+ width: size,
+ height: size,
+ density,
+ format: "png",
+ hasAlpha: true,
+ });
+ });
+});
diff --git a/package.json b/package.json
index 6da3467d..691cdce4 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
"release": "bun scripts/release.mjs",
"publish:stores": "bun scripts/store-delivery.mjs",
"test:desktop:sidecar": "bun scripts/test-desktop-sidecar.mjs",
- "test:desktop": "bun test apps/desktop/src/main/account-scope.test.mjs apps/desktop/src/main/diagnostic-log.test.mjs apps/desktop/src/main/file-association.test.mjs apps/desktop/src/main/file-permissions.test.mjs apps/desktop/src/main/installation-location.test.mjs apps/desktop/src/main/resource-url.test.mjs apps/desktop/src/main/staged-resource.test.mjs apps/desktop/src/main/user-data-directory.test.mjs apps/desktop/src/main/window-open-policy.test.mjs apps/desktop/src/main/window-visibility.test.mjs apps/web/src/lib/api.test.mjs apps/web/src/lib/app-page-path.test.mjs apps/web/src/lib/desktop-resources.test.mjs apps/web/src/lib/desktop-sync.test.mjs apps/web/src/lib/local-mirror.test.mjs apps/web/src/lib/repository.test.mjs apps/web/src/lib/runtime.test.mjs apps/web/src/lib/sync-queue.test.mjs && bun run test:desktop:sidecar",
+ "test:desktop": "bun test apps/desktop/src/main/account-scope.test.mjs apps/desktop/src/main/diagnostic-log.test.mjs apps/desktop/src/main/file-association.test.mjs apps/desktop/src/main/file-permissions.test.mjs apps/desktop/src/main/installation-location.test.mjs apps/desktop/src/main/resource-url.test.mjs apps/desktop/src/main/staged-resource.test.mjs apps/desktop/src/main/tray-icon.test.mjs apps/desktop/src/main/user-data-directory.test.mjs apps/desktop/src/main/window-open-policy.test.mjs apps/desktop/src/main/window-visibility.test.mjs apps/web/src/lib/api.test.mjs apps/web/src/lib/app-page-path.test.mjs apps/web/src/lib/desktop-resources.test.mjs apps/web/src/lib/desktop-sync.test.mjs apps/web/src/lib/local-mirror.test.mjs apps/web/src/lib/repository.test.mjs apps/web/src/lib/runtime.test.mjs apps/web/src/lib/sync-queue.test.mjs && bun run test:desktop:sidecar",
"verify:desktop-package": "bun scripts/verify-desktop-package.mjs",
"build:cloudflare": "bun run typecheck && bun run build",
"build:site": "bun --cwd apps/site build",