github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-21 11:30:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 通过 Alt+M 最小化后焦点回到先前的窗口 Fix https://github.com/siyuan-note/siyuan/issues/7275

Browse Source
This commit is contained in:
Liang Ding 2023-02-07 17:35:53 +08:00
parent 0c85850088
commit 5bd6bb8925
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/electron/main.js
View File

@ -635,6 +635,12 @@ app.whenReady().then(() => {
tray.setContextMenu(contextMenu)
}
const hideWindow = (wnd) => {
// 通过 `Alt+M` 最小化后焦点回到先前的窗口 https://github.com/siyuan-note/siyuan/issues/7275
wnd.minimize()
wnd.hide()
}
const showHideWindow = (tray, lang, mainWindow) => {
if (!mainWindow.isVisible()) {
if (mainWindow.isMinimized()) {
@ -642,7 +648,7 @@ app.whenReady().then(() => {
}
mainWindow.show()
} else {
mainWindow.hide()
hideWindow(mainWindow)
}
resetTrayMenu(tray, lang, mainWindow)
@ -657,7 +663,7 @@ app.whenReady().then(() => {
ipcMain.on('siyuan-config-tray', (event, data) => {
workspaces.find(item => {
if (item.id === data.id) {
item.browserWindow.hide()
hideWindow(item.browserWindow)
if ('win32' === process.platform || 'linux' === process.platform) {
resetTrayMenu(item.tray, data.languages, item.browserWindow)
}
@ -814,10 +820,10 @@ app.whenReady().then(() => {
if (!mainWindow.isFocused()) {
mainWindow.show()
} else {
mainWindow.hide()
hideWindow(mainWindow)
}
} else {
mainWindow.hide()
hideWindow(mainWindow)
}
} else {
mainWindow.show()