okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of github.com:ciderapp/Cider

Browse source
This commit is contained in:
Core 2024-05-18 19:22:57 +01:00
commit 7782e430aa
No known key found for this signature in database
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/base/app.ts
View file

@ -281,7 +281,7 @@ export class AppEvents {
this.tray.setToolTip(app.getName()); this.tray.setToolTip(app.getName());
this.setTray(false); this.setTray(false);
this.tray.on("double-click", () => { this.tray.on("double-click", () => { // supports windows and mac only
if (utils.getWindow()) { if (utils.getWindow()) {
if (utils.getWindow().isVisible()) { if (utils.getWindow().isVisible()) {
utils.getWindow().focus(); utils.getWindow().focus();
@ -291,6 +291,16 @@ export class AppEvents {
} }
}); });
this.tray.on("click", () => {
if (utils.getWindow() && process.platform === "linux") { // use single click to open when double doesn't work
if (utils.getWindow().isVisible()) {
utils.getWindow().focus();
} else {
utils.getWindow().show();
}
}
});
utils.getWindow().on("show", () => { utils.getWindow().on("show", () => {
this.setTray(true); this.setTray(true);
}); });

4
src/main/plugins/mpris.ts
View file

@ -73,6 +73,10 @@ export default class mpris {
player.on("volume", (volume: string) => { player.on("volume", (volume: string) => {
renderer.executeJavaScript(`app.mk.volume = ${parseFloat(volume)}`); renderer.executeJavaScript(`app.mk.volume = ${parseFloat(volume)}`);
}); });
player.on("raise", () => {
mpris.utils.getWindow().show();
mpris.utils.getWindow().focus();
});
mpris.utils.getIPCMain().on("mpris:playbackTimeDidChange", (event: any, time: number) => { mpris.utils.getIPCMain().on("mpris:playbackTimeDidChange", (event: any, time: number) => {
player.getPosition = () => time; player.getPosition = () => time;