0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests 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-13 00:00:49 +08:00
parent 57e65f664c
commit 1e8b027434
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 67 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
app/electron/main.js
View file

@ -397,96 +397,86 @@ const boot = () => {
await fetch(getServer() + '/api/system/uiproc?pid=' + process.pid,
{method: 'POST'})
})
// 系统托盘菜单
const trayMenuTemplate = [
{
label: 'Official Website',
click: () => {
shell.openExternal('https://b3log.org/siyuan/')
},
},
{
label: 'Open Source',
click: () => {
shell.openExternal('https://github.com/siyuan-note/siyuan')
},
},
{
label: '中文反馈',
click: () => {
shell.openExternal('https://ld246.com/article/1649901726096')
},
},
{
label: 'Reset Window on restart',
type: 'checkbox',
click: v => {
resetWindowStateOnRestart = v.checked
},
},
{
label: 'Quit',
click: () => {
mainWindow.webContents.send('siyuan-save-close', true)
},
}
]
const showWndMenu = {
label: 'Hide Window',
click: () => {
showHideWnd()
},
}
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)
}
}
ipcMain.on('siyuan-hotkey', (event, hotkey) => {
globalShortcut.unregisterAll()
if (!hotkey) {
return
}
globalShortcut.register(hotkey, () => {
if (mainWindow.isMinimized()) {
mainWindow.restore()
if (!mainWindow.isVisible()) {
mainWindow.show()
}
} else {
if (mainWindow.isVisible()) {
if (!mainWindow.isFocused()) {
mainWindow.show()
} else {
mainWindow.hide()
}
} else {
mainWindow.show()
}
}
showHideWnd()
})
})
if ('win32' === process.platform || 'linux' === process.platform) {
// 系统托盘
tray = new Tray(path.join(appDir, 'stage', 'icon-large.png'))
tray.setToolTip('SiYuan v' + appVer)
const trayMenuTemplate = [
{
label: 'Official Website',
click: () => {
shell.openExternal('https://b3log.org/siyuan/')
},
},
{
label: 'Open Source',
click: () => {
shell.openExternal('https://github.com/siyuan-note/siyuan')
},
},
{
label: '中文反馈',
click: () => {
shell.openExternal('https://ld246.com/article/1649901726096')
},
},
{
label: 'Reset Window on restart',
type: 'checkbox',
click: v => {
resetWindowStateOnRestart = v.checked
},
},
{
label: 'Quit',
click: () => {
mainWindow.webContents.send('siyuan-save-close', true)
},
}
]
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 = {}
if ('win32' === process.platform) {
// Windows 平台提供窗口置顶功能
@ -496,20 +486,20 @@ const boot = () => {
if (!mainWindow.isAlwaysOnTop()) {
mainWindow.setAlwaysOnTop(true)
changeWndTop.label = 'Cancel Window top'
trayMenuTemplate.splice(trayMenuTemplate.length - 2, 1, changeWndTop)
trayMenuTemplate.splice(1, 1, changeWndTop)
const contextMenu = Menu.buildFromTemplate(trayMenuTemplate)
tray.setContextMenu(contextMenu)
} else {
mainWindow.setAlwaysOnTop(false)
changeWndTop.label = 'Set Window top'
trayMenuTemplate.splice(trayMenuTemplate.length - 2, 1, changeWndTop)
trayMenuTemplate.splice(1, 1, changeWndTop)
const contextMenu = Menu.buildFromTemplate(trayMenuTemplate)
tray.setContextMenu(contextMenu)
}
},
};
trayMenuTemplate.splice(trayMenuTemplate.length - 1, 0, changeWndTop)
trayMenuTemplate.splice(1, 0, changeWndTop)
}
const contextMenu = Menu.buildFromTemplate(trayMenuTemplate)