Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 14:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/4567

Browse source
This commit is contained in:
Vanessa 2023-01-05 22:49:53 +08:00
parent 7199b5b193
commit e69419ba47
1 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

39
app/electron/main.js
View file

@ -394,13 +394,13 @@ const initKernel = (workspace, lang) => {
const server = net.createServer()
server.on('error', error => {
writeLog(error)
kernelPort = ""
kernelPort = ''
portReject()
})
server.listen(0, () => {
kernelPort = server.address().port
server.close(() => portResolve(kernelPort))
});
})
})
}
await getAvailablePort()
@ -754,31 +754,24 @@ app.whenReady().then(() => {
return
}
globalShortcut.register(data.hotkey, () => {
const mainWindow = BrowserWindow.fromId(data.id)
if (mainWindow.isMinimized()) {
mainWindow.restore()
if (!mainWindow.isVisible()) {
mainWindow.show()
}
} else {
if (mainWindow.isVisible()) {
if (!mainWindow.isFocused()) {
workspaces.forEach(item => {
const mainWindow = item.browserWindow
if (mainWindow.isMinimized()) {
mainWindow.restore()
if (!mainWindow.isVisible()) {
mainWindow.show()
} else {
mainWindow.hide()
}
} else {
mainWindow.show()
}
}
if ('win32' === process.platform || 'linux' === process.platform) {
workspaces.find(item => {
if (item.id === data.id) {
resetTrayMenu(item.tray, data.languages, mainWindow)
return true
if (mainWindow.isVisible()) {
mainWindow.hide()
} else {
mainWindow.show()
}
})
}
}
if ('win32' === process.platform || 'linux' === process.platform) {
resetTrayMenu(item.tray, data.languages, mainWindow)
}
})
})
})