Skip to content

Commit 6427b34

Browse files
committed
Override hide(),show(),isVisible from inside plugin
instead of changing source code
1 parent df8c77c commit 6427b34

File tree

4 files changed

+17
-9085
lines changed

4 files changed

+17
-9085
lines changed

index.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,7 @@ app.on("ready", () => {
286286
// Hide the window instead of quitting (quit is available in tray options)
287287
if (!forceQuit) {
288288
event.preventDefault();
289-
mainWindow.minimize()
290-
mainWindow.setSkipTaskbar(true);
289+
mainWindow.hide();
291290
}
292291
});
293292
}

plugins/taskbar-mediacontrol/back.js

+14
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@ const getSongInfo = require("../../providers/song-info");
33
const path = require('path');
44

55
module.exports = win => {
6+
win.hide = function () {
7+
win.minimize()
8+
win.setSkipTaskbar(true);}
9+
10+
win.show = function () {
11+
win.restore();
12+
win.focus();
13+
win.setSkipTaskbar(false);
14+
}
15+
16+
win.isVisible = function () {
17+
return !win.isMinimized();
18+
}
19+
620
const registerCallback = getSongInfo(win);
721
const { playPause, next, previous} = getSongControls(win);
822

tray.js

+2-8
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,8 @@ module.exports.setUpTray = (app, win) => {
2727
tray.on("click", () => {
2828
if (config.get("options.trayClickPlayPause")) {
2929
playPause();
30-
} else if(win.isMinimized()){
31-
win.restore();
32-
win.setSkipTaskbar(false);
3330
} else {
34-
win.minimize()
35-
win.setSkipTaskbar(true);
31+
win.isVisible() ? win.hide() : win.show();
3632
}
3733
});
3834

@@ -58,9 +54,7 @@ module.exports.setUpTray = (app, win) => {
5854
{
5955
label: "Show",
6056
click: () => {
61-
win.restore();
62-
win.focus();
63-
win.setSkipTaskbar(false);
57+
win.show();
6458
},
6559
},
6660
...mainMenuTemplate(win),

0 commit comments

Comments
 (0)