whai/cherry-studio
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: add adaptive tray icon handling

Browse Source
This commit is contained in:
kangfenmao 2024-11-12 17:52:00 +08:00
parent ceae1fa3d0
commit 7d3cae1f5b
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/tray_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.9 KiB

14
src/main/services/TrayService.ts
View File

@ -1,6 +1,8 @@
import { isMac } from '@main/constant'
import { locales } from '@main/utils/locales' import { locales } from '@main/utils/locales'
import { app, Menu, nativeImage, nativeTheme, Tray } from 'electron' import { app, Menu, nativeImage, nativeTheme, Tray } from 'electron'
import icon from '../../../build/tray_icon.png?asset'
import iconDark from '../../../build/tray_icon_dark.png?asset' import iconDark from '../../../build/tray_icon_dark.png?asset'
import iconLight from '../../../build/tray_icon_light.png?asset' import iconLight from '../../../build/tray_icon_light.png?asset'
import { configManager } from './ConfigManager' import { configManager } from './ConfigManager'
@ -15,15 +17,11 @@ export class TrayService {
} }
private createTray() { private createTray() {
const iconPath = nativeTheme.shouldUseDarkColors ? iconLight : iconDark const iconPath = isMac ? (nativeTheme.shouldUseDarkColors ? iconLight : iconDark) : icon
const tray = new Tray(iconPath) const tray = new Tray(iconPath)
if (process.platform === 'win32') { if (process.platform === 'win32') {
tray.setImage(iconPath) tray.setImage(iconPath)
nativeTheme.on('updated', () => {
const newIconPath = nativeTheme.shouldUseDarkColors ? iconLight : iconDark
tray.setImage(newIconPath)
})
} else if (process.platform === 'darwin') { } else if (process.platform === 'darwin') {
const image = nativeImage.createFromPath(iconPath) const image = nativeImage.createFromPath(iconPath)
const resizedImage = image.resize({ width: 16, height: 16 }) const resizedImage = image.resize({ width: 16, height: 16 })
@ -33,12 +31,6 @@ export class TrayService {
const image = nativeImage.createFromPath(iconPath) const image = nativeImage.createFromPath(iconPath)
const resizedImage = image.resize({ width: 16, height: 16 }) const resizedImage = image.resize({ width: 16, height: 16 })
tray.setImage(resizedImage) tray.setImage(resizedImage)
nativeTheme.on('updated', () => {
const newIconPath = nativeTheme.shouldUseDarkColors ? iconLight : iconDark
const newImage = nativeImage.createFromPath(newIconPath)
const newResizedImage = newImage.resize({ width: 16, height: 16 })
tray.setImage(newResizedImage)
})
} }
this.tray = tray this.tray = tray