extern/heynote
1
0
Fork 0
mirror of https://github.com/heyman/heynote.git synced 2024-11-21 15:33:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of global hotkey in Linux.

Browse Source
This commit is contained in:
Peter Jaric 2024-07-24 10:56:16 +02:00 committed by Jonatan Heyman
parent 633ea633b9
commit 372ce351b4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
electron/main/index.ts
View File

@ -83,7 +83,7 @@ async function createWindow() {
x: CONFIG.get("windowConfig.x"), x: CONFIG.get("windowConfig.x"),
y: CONFIG.get("windowConfig.y"), y: CONFIG.get("windowConfig.y"),
} }
// windowConfig.x and windowConfig.y will be undefined when config file is missing, e.g. first time run // windowConfig.x and windowConfig.y will be undefined when config file is missing, e.g. first time run
if (windowConfig.x !== undefined && windowConfig.y !== undefined) { if (windowConfig.x !== undefined && windowConfig.y !== undefined) {
// check if window is outside of screen, or too large // check if window is outside of screen, or too large
@ -203,7 +203,7 @@ function createTray() {
tray.setToolTip("Heynote"); tray.setToolTip("Heynote");
const menu = getTrayMenu(win) const menu = getTrayMenu(win)
if (isMac) { if (isMac) {
// using tray.setContextMenu() on macOS will open the menu on left-click, so instead we'll // using tray.setContextMenu() on macOS will open the menu on left-click, so instead we'll
// manually bind the right-click event to open the menu // manually bind the right-click event to open the menu
tray.addListener("right-click", () => { tray.addListener("right-click", () => {
tray?.popUpContextMenu(menu) tray?.popUpContextMenu(menu)
@ -233,6 +233,11 @@ function registerGlobalHotkey() {
// if alwaysOnTop is on, calling app.hide() won't hide the window // if alwaysOnTop is on, calling app.hide() won't hide the window
win.hide() win.hide()
} }
} else if (isLinux) {
win.blur()
// If we don't hide the window, it will stay on top of the stack even though it's not visible
// and pressing the hotkey again won't do anything
win.hide()
} else { } else {
win.blur() win.blur()
if (CONFIG.get("settings.showInMenu") || CONFIG.get("settings.alwaysOnTop")) { if (CONFIG.get("settings.showInMenu") || CONFIG.get("settings.alwaysOnTop")) {
@ -248,7 +253,7 @@ function registerGlobalHotkey() {
if (!win.isVisible()) { if (!win.isVisible()) {
win.show() win.show()
} }
win.focus() win.focus()
} }
}) })