dragonwocky/obsidian-tray
1
0
Fork 0
mirror of https://github.com/dragonwocky/obsidian-tray.git synced 2025-04-04 12:09:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

theoretically fix #28: quit app on macos if no windows remain

Browse Source 
fix: keep track of current window even after 'close' for toggling back to focus with hotkey if run in background enabled (bug introduced in 5cef2b0ed7)
This commit is contained in:
dragonwocky 2023-08-23 21:57:17 +10:00
parent 4c0c3da898
commit b62d8862ab
Signed by: dragonwocky
GPG Key ID: 7998D08F7D7BD7A8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main.js
View File

@ -38,7 +38,8 @@ const LOG_PREFIX = "obsidian-tray",
let tray, plugin; let tray, plugin;
const obsidian = require("obsidian"), const obsidian = require("obsidian"),
{ app, Tray, Menu, nativeImage } = require("electron").remote, { app, Tray, Menu } = require("electron").remote,
{ nativeImage, BrowserWindow } = require("electron").remote,
{ getCurrentWindow, globalShortcut } = require("electron").remote; { getCurrentWindow, globalShortcut } = require("electron").remote;
const vaultWindows = new Set(), const vaultWindows = new Set(),
@ -48,7 +49,9 @@ const vaultWindows = new Set(),
const onWindowCreation = (win) => { const onWindowCreation = (win) => {
vaultWindows.add(win); vaultWindows.add(win);
win.setSkipTaskbar(plugin.settings.hideTaskbarIcon); win.setSkipTaskbar(plugin.settings.hideTaskbarIcon);
win.on("close", () => vaultWindows.delete(win)); win.on("close", () => {
if (win !== getCurrentWindow()) vaultWindows.delete(win);
});
// preserve maximised windows after minimisation // preserve maximised windows after minimisation
if (win.isMaximized()) maximizedWindows.add(win); if (win.isMaximized()) maximizedWindows.add(win);
win.on("maximize", () => maximizedWindows.add(win)); win.on("maximize", () => maximizedWindows.add(win));
@ -125,7 +128,9 @@ const setLaunchOnStartup = () => {
unregisterHotkeys(); unregisterHotkeys();
allowWindowClose(); allowWindowClose();
destroyTray(); destroyTray();
getWindows().forEach((win) => win.destroy()); for (const win of getWindows()) win.destroy();
// force app quit if no windows remain on macos
if (!BrowserWindow.getAllWindows().length) app.quit();
}; };
const addQuickNote = () => { const addQuickNote = () => {
@ -240,8 +245,8 @@ const OPTIONS = [
default: false, default: false,
onChange() { onChange() {
setLaunchOnStartup(); setLaunchOnStartup();
const runInBackground = plugin.settings.runInBackground; if (plugin.settings.runInBackground) interceptWindowClose();
if (!runInBackground) showWindows(); else [allowWindowClose(), showWindows()];
}, },
}, },
{ {