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

🎨 改进系统托盘单击交互 Fix https://github.com/siyuan-note/siyuan/issues/6861

Browse source
This commit is contained in:
Liang Ding 2022-12-12 23:52:10 +08:00
parent e353561052
commit 57e65f664c
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

65
app/electron/main.js
View file

@ -427,21 +427,6 @@ const boot = () => {
tray = new Tray(path.join(appDir, 'stage', 'icon-large.png')) tray = new Tray(path.join(appDir, 'stage', 'icon-large.png'))
tray.setToolTip('SiYuan v' + appVer) tray.setToolTip('SiYuan v' + appVer)
const trayMenuTemplate = [ const trayMenuTemplate = [
{
label: 'Show Window',
click: () => {
if (mainWindow.isMinimized()) {
mainWindow.restore()
}
mainWindow.show()
},
},
{
label: 'Hide Window',
click: () => {
mainWindow.hide()
},
},
{ {
label: 'Official Website', label: 'Official Website',
click: () => { click: () => {
@ -475,21 +460,48 @@ const boot = () => {
} }
] ]
const showWndMenu = {
label: 'Hide Window',
click: () => {
showHideWnd()
},
}
trayMenuTemplate.splice(0, 0, showWndMenu)
const showHideWnd = () => {
if (!mainWindow.isVisible()) {
if (mainWindow.isMinimized()) {
mainWindow.restore()
}
showWndMenu.label = "Hide Window"
trayMenuTemplate.splice(0, 1, showWndMenu)
const contextMenu = Menu.buildFromTemplate(trayMenuTemplate)
tray.setContextMenu(contextMenu)
mainWindow.show()
} else {
mainWindow.hide()
showWndMenu.label = "Show Window"
trayMenuTemplate.splice(0, 1, showWndMenu)
const contextMenu = Menu.buildFromTemplate(trayMenuTemplate)
tray.setContextMenu(contextMenu)
}
}
let changeWndTop = {} let changeWndTop = {}
if ('win32' === process.platform) { if ('win32' === process.platform) {
// Windows 平台提供窗口置顶功能 // Windows 平台提供窗口置顶功能
changeWndTop = { changeWndTop = {
label: 'Set Window Top', label: 'Set Window top',
click: () => { click: () => {
if (!mainWindow.isAlwaysOnTop()) { if (!mainWindow.isAlwaysOnTop()) {
mainWindow.setAlwaysOnTop(true) mainWindow.setAlwaysOnTop(true)
changeWndTop.label = 'Cancel window top' changeWndTop.label = 'Cancel Window top'
trayMenuTemplate.splice(trayMenuTemplate.length - 2, 1, changeWndTop) trayMenuTemplate.splice(trayMenuTemplate.length - 2, 1, changeWndTop)
const contextMenu = Menu.buildFromTemplate(trayMenuTemplate) const contextMenu = Menu.buildFromTemplate(trayMenuTemplate)
tray.setContextMenu(contextMenu) tray.setContextMenu(contextMenu)
} else { } else {
mainWindow.setAlwaysOnTop(false) mainWindow.setAlwaysOnTop(false)
changeWndTop.label = 'Set window top' changeWndTop.label = 'Set Window top'
trayMenuTemplate.splice(trayMenuTemplate.length - 2, 1, changeWndTop) trayMenuTemplate.splice(trayMenuTemplate.length - 2, 1, changeWndTop)
const contextMenu = Menu.buildFromTemplate(trayMenuTemplate) const contextMenu = Menu.buildFromTemplate(trayMenuTemplate)
tray.setContextMenu(contextMenu) tray.setContextMenu(contextMenu)
@ -503,22 +515,7 @@ const boot = () => {
const contextMenu = Menu.buildFromTemplate(trayMenuTemplate) const contextMenu = Menu.buildFromTemplate(trayMenuTemplate)
tray.setContextMenu(contextMenu) tray.setContextMenu(contextMenu)
tray.on('click', () => { tray.on('click', () => {
if (mainWindow.isMinimized()) { showHideWnd()
mainWindow.restore()
if (!mainWindow.isVisible()) {
mainWindow.show()
}
} else {
if (mainWindow.isVisible()) {
if (!mainWindow.isFocused()) {
mainWindow.show()
} else {
mainWindow.hide()
}
} else {
mainWindow.show()
}
}
}) })
} }
} }