Baltrust/Vesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: show custom icon on startup initially

Browse source
This commit is contained in:
Oleh Polisan 2024-08-25 00:08:36 +03:00
parent a014cf55b9
commit 0571807ff3
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/mainWindow.ts
View file

@ -18,10 +18,11 @@ import {
systemPreferences, systemPreferences,
Tray Tray
} from "electron"; } from "electron";
import { existsSync } from "fs";
import { rm } from "fs/promises"; import { rm } from "fs/promises";
import { join } from "path"; import { join } from "path";
import { IpcEvents } from "shared/IpcEvents"; import { IpcEvents } from "shared/IpcEvents";
import { ICON_PATH } from "shared/paths"; import { ICON_PATH, ICONS_DIR } from "shared/paths";
import { isTruthy } from "shared/utils/guards"; import { isTruthy } from "shared/utils/guards";
import { once } from "shared/utils/once"; import { once } from "shared/utils/once";
import type { SettingsStore } from "shared/utils/SettingsStore"; import type { SettingsStore } from "shared/utils/SettingsStore";
@ -40,7 +41,6 @@ import {
} from "./constants"; } from "./constants";
import { Settings, State, VencordSettings } from "./settings"; import { Settings, State, VencordSettings } from "./settings";
import { createSplashWindow } from "./splash"; import { createSplashWindow } from "./splash";
import { setTrayIcon } from "./tray";
import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally"; import { makeLinksOpenExternally } from "./utils/makeLinksOpenExternally";
import { applyDeckKeyboardFix, askToApplySteamLayout, isDeckGameMode } from "./utils/steamOS"; import { applyDeckKeyboardFix, askToApplySteamLayout, isDeckGameMode } from "./utils/steamOS";
import { downloadVencordFiles, ensureVencordFiles } from "./utils/vencordLoader"; import { downloadVencordFiles, ensureVencordFiles } from "./utils/vencordLoader";
@ -126,8 +126,11 @@ function initTray(win: BrowserWindow) {
} }
]); ]);
if (Settings.store.trayMainOverride && existsSync(join(ICONS_DIR, "icon_custom.png"))) {
tray = new Tray(join(ICONS_DIR, "icon_custom.png"));
} else {
tray = new Tray(ICON_PATH); tray = new Tray(ICON_PATH);
setTrayIcon("icon"); }
tray.setToolTip("Vesktop"); tray.setToolTip("Vesktop");
tray.setContextMenu(trayMenu); tray.setContextMenu(trayMenu);
tray.on("click", onTrayClick); tray.on("click", onTrayClick);