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

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