YuuMJ1997/mihomo-party
1
0
Fork 0
mirror of https://gh.catmak.name/https://github.com/mihomo-party-org/mihomo-party synced 2025-12-27 05:00:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: tray icon show on macos

Browse Source
This commit is contained in:
Memory 2025-08-25 22:50:42 +08:00 committed by GitHub
parent e75fb996c2
commit b2aab804a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resolve/tray.ts
View File

@ -14,6 +14,7 @@ import pngIcon from '../../../resources/icon.png?asset'
import pngIconBlue from '../../../resources/icon_blue.png?asset' import pngIconBlue from '../../../resources/icon_blue.png?asset'
import pngIconRed from '../../../resources/icon_red.png?asset' import pngIconRed from '../../../resources/icon_red.png?asset'
import pngIconGreen from '../../../resources/icon_green.png?asset' import pngIconGreen from '../../../resources/icon_green.png?asset'
import templateIcon from '../../../resources/iconTemplate.png?asset'
import { mihomoChangeProxy, mihomoCloseAllConnections, mihomoGroups, patchMihomoConfig, getTrayIconStatus } from '../core/mihomoApi' import { mihomoChangeProxy, mihomoCloseAllConnections, mihomoGroups, patchMihomoConfig, getTrayIconStatus } from '../core/mihomoApi'
import { mainWindow, showMainWindow, triggerMainWindow } from '..' import { mainWindow, showMainWindow, triggerMainWindow } from '..'
import { app, clipboard, ipcMain, Menu, nativeImage, shell, Tray } from 'electron' import { app, clipboard, ipcMain, Menu, nativeImage, shell, Tray } from 'electron'
@ -334,8 +335,7 @@ export async function createTray(): Promise<void> {
tray.setContextMenu(menu) tray.setContextMenu(menu)
} }
if (process.platform === 'darwin') { if (process.platform === 'darwin') {
const iconPaths = getIconPaths() const icon = nativeImage.createFromPath(templateIcon).resize({ height: 16 })
const icon = nativeImage.createFromPath(iconPaths.white).resize({ height: 16 })
icon.setTemplateImage(true) icon.setTemplateImage(true)
tray = new Tray(icon) tray = new Tray(icon)
} }
@ -468,7 +468,6 @@ export async function updateTrayIcon(): Promise<void> {
try { try {
if (process.platform === 'darwin') { if (process.platform === 'darwin') {
const icon = nativeImage.createFromPath(iconPath).resize({ height: 16 }) const icon = nativeImage.createFromPath(iconPath).resize({ height: 16 })
icon.setTemplateImage(true)
tray.setImage(icon) tray.setImage(icon)
} else if (process.platform === 'win32') { } else if (process.platform === 'win32') {
tray.setImage(iconPath) tray.setImage(iconPath)