diff --git a/package.json b/package.json index 3b9ceecf..e413cca3 100644 --- a/package.json +++ b/package.json @@ -90,12 +90,12 @@ "./licenses" ], "win": { - "icon": "./resources/icons/256x256.ico", + "icon": "./resources/icons", "legalTrademarks": "lyswhut", "artifactName": "${productName} v${version} ${env.ARCH} ${env.TARGET}.${ext}" }, "mac": { - "icon": "./resources/icons/512x512.icns", + "icon": "./resources/icons", "category": "public.app-category.music" }, "linux": { diff --git a/publish/changeLog.md b/publish/changeLog.md index 1e24037e..fe4e6ff3 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -9,6 +9,7 @@ - 优化进入、离开播放详情页的性能 - 大幅优化我的列表、下载、歌单、排行榜列表性能,现在即使同一列表内的歌曲很多时也不会卡顿了 - 兼容桌面歌词以触摸的方式移动、调整大小 +- 调整图标尺寸 ### 修复 diff --git a/resources/icons/256x256.ico b/resources/icons/256x256.ico deleted file mode 100644 index a961683d..00000000 Binary files a/resources/icons/256x256.ico and /dev/null differ diff --git a/resources/icons/256x256.png b/resources/icons/256x256.png new file mode 100644 index 00000000..41e33fd1 Binary files /dev/null and b/resources/icons/256x256.png differ diff --git a/resources/icons/32x32.png b/resources/icons/32x32.png new file mode 100644 index 00000000..b69688c5 Binary files /dev/null and b/resources/icons/32x32.png differ diff --git a/resources/icons/40x40.png b/resources/icons/40x40.png new file mode 100644 index 00000000..3f3136cb Binary files /dev/null and b/resources/icons/40x40.png differ diff --git a/resources/icons/48x48.png b/resources/icons/48x48.png new file mode 100644 index 00000000..aba6fbea Binary files /dev/null and b/resources/icons/48x48.png differ diff --git a/resources/icons/512x512.icns b/resources/icons/512x512.icns deleted file mode 100644 index 8bb1977e..00000000 Binary files a/resources/icons/512x512.icns and /dev/null differ diff --git a/resources/icons/512x512.png b/resources/icons/512x512.png index 6f6e3c39..f8485327 100644 Binary files a/resources/icons/512x512.png and b/resources/icons/512x512.png differ diff --git a/resources/icons/64x64.png b/resources/icons/64x64.png new file mode 100644 index 00000000..99a3de8d Binary files /dev/null and b/resources/icons/64x64.png differ diff --git a/src/main/modules/tray.js b/src/main/modules/tray.js index 57827b03..183979fa 100644 --- a/src/main/modules/tray.js +++ b/src/main/modules/tray.js @@ -1,5 +1,5 @@ -const { app, Tray, Menu } = require('electron') -const { isWin } = require('../../common/utils') +const { app, Tray, Menu, nativeImage } = require('electron') +// const { isWin } = require('../../common/utils') const { tray: TRAY_EVENT_NAME, common: COMMON_EVENT_NAME, mainWindow: MAIN_WINDOW_NAME } = require('../events/_name') const path = require('path') let isEnableTray = null @@ -44,10 +44,10 @@ const createTray = () => { themeId = global.appSetting.tray.themeId let themeName = (themeList.find(item => item.id === themeId) || themeList[0]).fileName - const iconPath = path.join(global.__static, 'images/tray', isWin ? themeName + '@2x.ico' : themeName + '.png') + const iconPath = path.join(global.__static, 'images/tray', themeName + '.png') // 托盘 - global.modules.tray = new Tray(iconPath) + global.modules.tray = new Tray(nativeImage.createFromPath(iconPath)) global.modules.tray.setToolTip('洛雪音乐助手') createMenu(global.modules.tray) @@ -141,6 +141,6 @@ const createMenu = tray => { const setTrayImage = themeId => { if (!global.modules.tray) return let themeName = (themeList.find(item => item.id === themeId) || themeList[0]).fileName - const iconPath = path.join(global.__static, 'images/tray', isWin ? themeName + '@2x.ico' : themeName + '.png') - global.modules.tray.setImage(iconPath) + const iconPath = path.join(global.__static, 'images/tray', themeName + '.png') + global.modules.tray.setImage(nativeImage.createFromPath(iconPath)) } diff --git a/src/static/images/tray/tray0Template.ico b/src/static/images/tray/tray0Template.ico deleted file mode 100644 index 42ed6b64..00000000 Binary files a/src/static/images/tray/tray0Template.ico and /dev/null differ diff --git a/src/static/images/tray/tray0Template.png b/src/static/images/tray/tray0Template.png index bb5b583e..c67852ff 100644 Binary files a/src/static/images/tray/tray0Template.png and b/src/static/images/tray/tray0Template.png differ diff --git a/src/static/images/tray/tray0Template@1.25x.png b/src/static/images/tray/tray0Template@1.25x.png new file mode 100644 index 00000000..9039101f Binary files /dev/null and b/src/static/images/tray/tray0Template@1.25x.png differ diff --git a/src/static/images/tray/tray0Template@1.5x.png b/src/static/images/tray/tray0Template@1.5x.png new file mode 100644 index 00000000..2e9c29e4 Binary files /dev/null and b/src/static/images/tray/tray0Template@1.5x.png differ diff --git a/src/static/images/tray/tray0Template@2x.ico b/src/static/images/tray/tray0Template@2x.ico deleted file mode 100644 index fa18bfe1..00000000 Binary files a/src/static/images/tray/tray0Template@2x.ico and /dev/null differ diff --git a/src/static/images/tray/tray0Template@2x.png b/src/static/images/tray/tray0Template@2x.png index 719fab28..67d55fa3 100644 Binary files a/src/static/images/tray/tray0Template@2x.png and b/src/static/images/tray/tray0Template@2x.png differ