gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-10 08:29:00 +01:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Send global shortcut to current window (#7645)

Browse Source
This commit is contained in:
Elian Doran 2025-11-08 08:31:17 +02:00 committed by GitHub
commit 051e2b4eef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/server/src/services/window.ts
View File

@ -337,14 +337,15 @@ async function registerGlobalShortcuts() {
const result = globalShortcut.register( const result = globalShortcut.register(
translatedShortcut, translatedShortcut,
cls.wrap(() => { cls.wrap(() => {
if (!mainWindow) { const targetWindow = getLastFocusedWindow() || mainWindow;
if (!targetWindow || targetWindow.isDestroyed()) {
return; return;
} }
// window may be hidden / not in focus // window may be hidden / not in focus
mainWindow.focus(); showAndFocusWindow(targetWindow);
mainWindow.webContents.send("globalShortcut", action.actionName); targetWindow.webContents.send("globalShortcut", action.actionName);
}) })
); );
@ -358,6 +359,17 @@ async function registerGlobalShortcuts() {
} }
} }
function showAndFocusWindow(window: BrowserWindow) {
if (!window) return;
if (window.isMinimized()) {
window.restore();
}
window.show();
window.focus();
}
function getMainWindow() { function getMainWindow() {
return mainWindow; return mainWindow;
} }