Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
刘嘉伟 2023-12-01 16:24:06 +08:00
commit 9bdeccaab2

View File

@ -84,9 +84,9 @@ async function createWindow() {
const {Menu} = require("electron");
Menu.setApplicationMenu(null);
// hide menu for Mac
if (process.platform !== "darwin") {
app.dock.hide();
}
// if (process.platform !== "darwin") {
// app.dock.hide();
// }
win.on('minimize', function (event) {
event.preventDefault();
@ -128,6 +128,11 @@ export const createTray = () => {
tray.setToolTip('Frpc Desktop')
const contextMenu = Menu.buildFromTemplate(menu)
tray.setContextMenu(contextMenu)
// 托盘双击打开
tray.on('double-click', () => {
win.show();
})
}
app.whenReady().then(() => {