diff --git a/src/main/index.js b/src/main/index.js index 149c94c8..979e5c9f 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -7,13 +7,13 @@ if (!app.requestSingleInstanceLock()) { return } app.on('second-instance', (event, argv, cwd) => { - if (mainWindow) { - if (mainWindow.isMinimized()) { - mainWindow.restore() - } else if (mainWindow.isVisible()) { - mainWindow.focus() + if (global.mainWindow) { + if (global.mainWindow.isMinimized()) { + global.mainWindow.restore() + } else if (global.mainWindow.isVisible()) { + global.mainWindow.focus() } else { - mainWindow.show() + global.mainWindow.show() } } else { app.quit() @@ -67,7 +67,7 @@ const winEvent = require('./rendererEvents/winEvent') const autoUpdate = require('./utils/autoUpdate') const { isMac, isLinux } = require('../common/utils') -let mainWindow + let winURL if (isDev) { @@ -84,7 +84,7 @@ function createWindow() { /** * Initial window options */ - mainWindow = global.mainWindow = new BrowserWindow({ + global.mainWindow = new BrowserWindow({ height: windowSizeInfo.height, useContentSize: true, width: windowSizeInfo.width, @@ -103,9 +103,9 @@ function createWindow() { }, }) - mainWindow.loadURL(winURL) + global.mainWindow.loadURL(winURL) - winEvent(mainWindow) + winEvent(global.mainWindow) // mainWindow.webContents.openDevTools() if (!isDev) autoUpdate() @@ -120,7 +120,17 @@ function init() { app.on('ready', init) app.on('activate', () => { - if (mainWindow === null) return init() + if (global.mainWindow) { + if (global.mainWindow.isMinimized()) { + global.mainWindow.restore() + } else if (global.mainWindow.isVisible()) { + global.mainWindow.focus() + } else { + global.mainWindow.show() + } + } else if (global.mainWindow === null) { + init() + } }) app.on('window-all-closed', () => { diff --git a/src/main/modules/tray.js b/src/main/modules/tray.js index ab825258..6f496f72 100644 --- a/src/main/modules/tray.js +++ b/src/main/modules/tray.js @@ -1,5 +1,5 @@ const { app, Tray, Menu } = require('electron') -const { isMac, isWin } = require('../../common/utils') +const { isWin } = require('../../common/utils') const { tray: TRAY_EVENT_NAME } = require('../events/_name') const path = require('path') global.lx_event.tray.on(TRAY_EVENT_NAME.create, () => { @@ -13,7 +13,7 @@ let tray function createTray() { if ((tray && !tray.isDestroyed()) || !global.appSetting.tray || !global.appSetting.tray.isShow) return - const iconPath = path.join(global.__static, 'images/tray', isWin ? '256x256.ico' : isMac ? '512x512.icns' : '512x512.png') + const iconPath = path.join(global.__static, 'images/tray', isWin ? 'trayTemplate.ico' : 'trayTemplate.png') // 托盘 tray = new Tray(iconPath) diff --git a/src/static/images/tray/256x256.ico b/src/static/images/tray/256x256.ico deleted file mode 100644 index a961683d..00000000 Binary files a/src/static/images/tray/256x256.ico and /dev/null differ diff --git a/src/static/images/tray/512x512.icns b/src/static/images/tray/512x512.icns deleted file mode 100644 index 8bb1977e..00000000 Binary files a/src/static/images/tray/512x512.icns and /dev/null differ diff --git a/src/static/images/tray/512x512.png b/src/static/images/tray/512x512.png deleted file mode 100644 index 6f6e3c39..00000000 Binary files a/src/static/images/tray/512x512.png and /dev/null differ diff --git a/src/static/images/tray/trayTemplate.ico b/src/static/images/tray/trayTemplate.ico new file mode 100644 index 00000000..42ed6b64 Binary files /dev/null and b/src/static/images/tray/trayTemplate.ico differ diff --git a/src/static/images/tray/trayTemplate.png b/src/static/images/tray/trayTemplate.png new file mode 100644 index 00000000..bb5b583e Binary files /dev/null and b/src/static/images/tray/trayTemplate.png differ diff --git a/src/static/images/tray/trayTemplate@2x.ico b/src/static/images/tray/trayTemplate@2x.ico new file mode 100644 index 00000000..fa18bfe1 Binary files /dev/null and b/src/static/images/tray/trayTemplate@2x.ico differ diff --git a/src/static/images/tray/trayTemplate@2x.png b/src/static/images/tray/trayTemplate@2x.png new file mode 100644 index 00000000..719fab28 Binary files /dev/null and b/src/static/images/tray/trayTemplate@2x.png differ