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

ciderapp · May 18, 2024 · 7782e43 · 7782e43
2 parents 237c4ef + e814b13
commit 7782e43
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/main/base/app.ts b/src/main/base/app.ts
@@ -281,7 +281,7 @@ export class AppEvents {
     this.tray.setToolTip(app.getName());
     this.setTray(false);
 
-    this.tray.on("double-click", () => {
+    this.tray.on("double-click", () => {  // supports windows and mac only
       if (utils.getWindow()) {
         if (utils.getWindow().isVisible()) {
           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", () => {
       this.setTray(true);
     });

diff --git a/src/main/plugins/mpris.ts b/src/main/plugins/mpris.ts
@@ -73,6 +73,10 @@ export default class mpris {
     player.on("volume", (volume: string) => {
       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) => {
       player.getPosition = () => time;