diff --git a/res/img/monochrome.ico b/res/img/monochrome.ico deleted file mode 100644 index 4dd249e..0000000 Binary files a/res/img/monochrome.ico and /dev/null differ diff --git a/res/img/monochrome.png b/res/img/monochrome.png deleted file mode 100644 index a3f5018..0000000 Binary files a/res/img/monochrome.png and /dev/null differ diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts index 6a7a394..4404692 100644 --- a/src/@types/global.d.ts +++ b/src/@types/global.d.ts @@ -20,8 +20,8 @@ declare global { var launcher: AutoLaunch; var vectorConfig: Record; var trayConfig: { - color_icon_path: string; // eslint-disable-line camelcase - monochrome_icon_path: string; // eslint-disable-line camelcase + // eslint-disable-next-line camelcase + icon_path: string; brand: string; }; var store: Store<{ @@ -31,7 +31,6 @@ declare global { autoHideMenuBar?: boolean; locale?: string | string[]; disableHardwareAcceleration?: boolean; - monochromeIcon?: boolean; }>; } /* eslint-enable no-var */ diff --git a/src/electron-main.ts b/src/electron-main.ts index a3623a6..5a948cb 100644 --- a/src/electron-main.ts +++ b/src/electron-main.ts @@ -212,11 +212,9 @@ async function setupGlobals(): Promise { // The tray icon // It's important to call `path.join` so we don't end up with the packaged asar in the final path. - const colorIconFile = `element.${process.platform === "win32" ? "ico" : "png"}`; - const monochromeIconFile = `monochrome.${process.platform === "win32" ? "ico" : "png"}`; + const iconFile = `element.${process.platform === "win32" ? "ico" : "png"}`; global.trayConfig = { - monochrome_icon_path: path.join(resPath, "img", monochromeIconFile), - color_icon_path: path.join(resPath, "img", colorIconFile), + icon_path: path.join(resPath, "img", iconFile), brand: global.vectorConfig.brand || "Element", }; @@ -455,7 +453,7 @@ app.on("ready", async () => { titleBarStyle: process.platform === "darwin" ? "hidden" : "default", trafficLightPosition: { x: 9, y: 8 }, - icon: global.trayConfig.color_icon_path, + icon: global.trayConfig.icon_path, show: false, autoHideMenuBar: global.store.get("autoHideMenuBar", true), diff --git a/src/settings.ts b/src/settings.ts index b4a13ad..50e3a08 100644 --- a/src/settings.ts +++ b/src/settings.ts @@ -67,13 +67,4 @@ export const Settings: Record = { global.store.set("disableHardwareAcceleration", !value); }, }, - "Electron.monochromeIcon": { - async read(): Promise { - return tray.isMonochrome(); - }, - async write(value: any): Promise { - global.store.set("monochromeIcon", value); - tray.refreshIcon(); - }, - }, }; diff --git a/src/tray.ts b/src/tray.ts index b863238..339ca83 100644 --- a/src/tray.ts +++ b/src/tray.ts @@ -28,19 +28,6 @@ export function destroy(): void { } } -export function isMonochrome(): boolean { - return global.store.get("monochromeIcon", process.platform === "linux"); -} - -export function refreshIcon(): void { - const monochrome = isMonochrome(); - if (monochrome) { - trayIcon?.setImage(nativeImage.createFromPath(global.trayConfig.monochrome_icon_path)); - } else { - trayIcon?.setImage(nativeImage.createFromPath(global.trayConfig.color_icon_path)); - } -} - function toggleWin(): void { if (global.mainWindow?.isVisible() && !global.mainWindow.isMinimized() && global.mainWindow.isFocused()) { global.mainWindow.hide(); @@ -52,8 +39,7 @@ function toggleWin(): void { } interface IConfig { - color_icon_path: string; // eslint-disable-line camelcase - monochrome_icon_path: string; // eslint-disable-line camelcase + icon_path: string; // eslint-disable-line camelcase brand: string; } @@ -66,9 +52,7 @@ function getUuid(): string { export function create(config: IConfig): void { // no trays on darwin if (process.platform === "darwin" || trayIcon) return; - const defaultIcon = nativeImage.createFromPath( - isMonochrome() ? config.monochrome_icon_path : config.color_icon_path, - ); + const defaultIcon = nativeImage.createFromPath(config.icon_path); let guid: string | undefined; if (process.platform === "win32" && app.isPackaged) {