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

fix #28: restore dock on close, hide dock on focus if req

Browse Source
This commit is contained in:
dragonwocky 2023-08-24 18:39:19 +10:00
parent 999213801f
commit b60e453b68
Signed by: dragonwocky
GPG Key ID: 7998D08F7D7BD7A8
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
main.js
View File

@ -59,6 +59,19 @@ const vaultWindows = new Set(),
}; };
onWindowCreation(getCurrentWindow()); onWindowCreation(getCurrentWindow());
getCurrentWindow().webContents.on("did-create-window", onWindowCreation); getCurrentWindow().webContents.on("did-create-window", onWindowCreation);
if (process.platform === "darwin") {
// on macos, the "hide taskbar icon" option is implemented
// via app.dock.hide(): thus, the app as a whole will be
// hidden from the dock, including windows from other vaults.
// when a vault is closed via the "close vault" button,
// the cleanup process will call app.dock.show() to restore
// access to any other open vaults w/out the tray enabled
// => thus, this listener is required to re-hide the dock
// if switching to another vault with the option enabled
getCurrentWindow().on("focus", () => {
if (plugin.settings.hideTaskbarIcon) hideTaskbarIcons();
});
}
}, },
showWindows = () => { showWindows = () => {
log(LOG_SHOWING_WINDOWS); log(LOG_SHOWING_WINDOWS);
@ -110,14 +123,21 @@ const hideTaskbarIcons = () => {
showTaskbarIcons = () => { showTaskbarIcons = () => {
getWindows().forEach((win) => win.setSkipTaskbar(false)); getWindows().forEach((win) => win.setSkipTaskbar(false));
if (process.platform === "darwin") app.dock.show(); if (process.platform === "darwin") app.dock.show();
}; },
setLaunchOnStartup = () => {
const setLaunchOnStartup = () => {
const { launchOnStartup, runInBackground, hideOnLaunch } = plugin.settings; const { launchOnStartup, runInBackground, hideOnLaunch } = plugin.settings;
app.setLoginItemSettings({ app.setLoginItemSettings({
openAtLogin: launchOnStartup, openAtLogin: launchOnStartup,
openAsHidden: runInBackground && hideOnLaunch, openAsHidden: runInBackground && hideOnLaunch,
}); });
};
const cleanup = () => {
log(LOG_CLEANUP);
unregisterHotkeys();
showTaskbarIcons();
allowWindowClose();
destroyTray();
}, },
relaunchApp = () => { relaunchApp = () => {
app.relaunch(); app.relaunch();
@ -125,9 +145,7 @@ const setLaunchOnStartup = () => {
}, },
closeVault = () => { closeVault = () => {
log(LOG_CLEANUP); log(LOG_CLEANUP);
unregisterHotkeys(); cleanup();
allowWindowClose();
destroyTray();
const vaultWindows = getWindows(), const vaultWindows = getWindows(),
obsidianWindows = BrowserWindow.getAllWindows(); obsidianWindows = BrowserWindow.getAllWindows();
if (obsidianWindows.length === vaultWindows.length) { if (obsidianWindows.length === vaultWindows.length) {
@ -454,11 +472,7 @@ class TrayPlugin extends obsidian.Plugin {
}); });
} }
onunload() { onunload() {
log(LOG_CLEANUP); cleanup();
unregisterHotkeys();
allowWindowClose();
showTaskbarIcons();
destroyTray();
} }
async loadSettings() { async loadSettings() {

2
manifest.json
View File

@ -4,7 +4,7 @@
"author": "dragonwocky", "author": "dragonwocky",
"authorUrl": "https://dragonwocky.me/", "authorUrl": "https://dragonwocky.me/",
"description": "Run Obsidian from the system tray for customisable window management & global quick notes", "description": "Run Obsidian from the system tray for customisable window management & global quick notes",
"version": "0.3.3", "version": "0.3.4",
"isDesktopOnly": true, "isDesktopOnly": true,
"minAppVersion": "1.0.0" "minAppVersion": "1.0.0"
} }