Merge branch 'master' into migrate-from-remote-to-ipc

This commit is contained in:
Araxeus
2022-04-09 17:04:06 +03:00
committed by GitHub

13
tray.js
View File

@ -1,6 +1,6 @@
const path = require("path"); const path = require("path");
const { Menu, nativeImage, Tray } = require("electron"); const { app, Menu, nativeImage, Tray } = require("electron");
const { restart } = require("./providers/app-controls"); const { restart } = require("./providers/app-controls");
const config = require("./config"); const config = require("./config");
@ -28,7 +28,13 @@ module.exports.setUpTray = (app, win) => {
if (config.get("options.trayClickPlayPause")) { if (config.get("options.trayClickPlayPause")) {
playPause(); playPause();
} else { } else {
win.isVisible() ? win.hide() : win.show(); if (win.isVisible()) {
win.hide();
app.dock?.hide();
} else {
win.show();
app.dock?.show();
}
} }
}); });
@ -55,13 +61,14 @@ module.exports.setUpTray = (app, win) => {
label: "Show", label: "Show",
click: () => { click: () => {
win.show(); win.show();
app.dock?.show();
}, },
}, },
{ {
label: "Restart App", label: "Restart App",
click: restart click: restart
}, },
{ role: "quit" } { role: "quit" },
]; ];
const trayMenu = Menu.buildFromTemplate(template); const trayMenu = Menu.buildFromTemplate(template);