From 704732a046e791011630d3009e9312db8e85016a Mon Sep 17 00:00:00 2001
From: memorydream <34763046+memorydream@users.noreply.github.com>
Date: Mon, 11 Oct 2021 10:19:27 +0800
Subject: [PATCH] =?UTF-8?q?try=20tray=20context=20on=20linux=20|=20?=
 =?UTF-8?q?=E5=B0=9D=E8=AF=95=E5=9C=A8linux=E4=B8=8A=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E6=89=98=E7=9B=98=E8=8F=9C=E5=8D=95=20(#926)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* try tray context on linux

* 调整linux下托盘菜单的选项位置

* bug fix

* fix : linux tray contextMenu cant open

* prettier code

* 移除 显示主面板 的图标
---
 src/electron/tray.js | 162 +++++++++++++++++++++++++------------------
 1 file changed, 94 insertions(+), 68 deletions(-)

diff --git a/src/electron/tray.js b/src/electron/tray.js
index 0981460..b0ec291 100644
--- a/src/electron/tray.js
+++ b/src/electron/tray.js
@@ -9,79 +9,105 @@ export function createTray(win) {
       height: 20,
       width: 20,
     });
-  let tray = new Tray(icon);
 
+  let contextMenu = Menu.buildFromTemplate([
+    //setContextMenu破坏了预期的click行为
+    //在linux下，鼠标左右键都会呼出contextMenu
+    //所以此处单独为linux添加一个 显示主面板 选项
+    ...(process.platform === 'linux'
+      ? [
+          {
+            label: '显示主面板',
+            click: () => {
+              win.show();
+            },
+          },
+          {
+            type: 'separator',
+          },
+        ]
+      : []),
+    {
+      label: '播放/暂停',
+      icon: nativeImage.createFromPath(
+        path.join(__static, 'img/icons/play.png')
+      ),
+      click: () => {
+        win.webContents.send('play');
+      },
+    },
+    {
+      label: '上一首',
+      icon: nativeImage.createFromPath(
+        path.join(__static, 'img/icons/left.png')
+      ),
+      accelerator: 'CmdOrCtrl+Left',
+      click: () => {
+        win.webContents.send('previous');
+      },
+    },
+    {
+      label: '下一首',
+      icon: nativeImage.createFromPath(
+        path.join(__static, 'img/icons/right.png')
+      ),
+      accelerator: 'CmdOrCtrl+Right',
+      click: () => {
+        win.webContents.send('next');
+      },
+    },
+    {
+      label: '循环播放',
+      icon: nativeImage.createFromPath(
+        path.join(__static, 'img/icons/repeat.png')
+      ),
+      accelerator: 'Alt+R',
+      click: () => {
+        win.webContents.send('repeat');
+      },
+    },
+    {
+      label: '加入喜欢',
+      icon: nativeImage.createFromPath(
+        path.join(__static, 'img/icons/like.png')
+      ),
+      accelerator: 'CmdOrCtrl+L',
+      click: () => {
+        win.webContents.send('like');
+      },
+    },
+    {
+      label: '退出',
+      icon: nativeImage.createFromPath(
+        path.join(__static, 'img/icons/exit.png')
+      ),
+      accelerator: 'CmdOrCtrl+W',
+      click: () => {
+        app.exit();
+      },
+    },
+  ]);
+  let tray = new Tray(icon);
   tray.setToolTip('YesPlayMusic');
 
-  tray.on('click', () => {
-    win.show();
-  });
+  if (process.platform === 'linux') {
+    //linux下托盘的实现方式比较迷惑
+    //right-click无法在linux下使用
+    //click在默认行为下会弹出一个contextMenu，里面的唯一选项才会调用click事件
+    //setContextMenu应该是目前唯一能在linux下使用托盘菜单api
+    //但是无法区分鼠标左右键
 
-  tray.on('right-click', () => {
-    const contextMenu = Menu.buildFromTemplate([
-      {
-        label: '播放/暂停',
-        icon: nativeImage.createFromPath(
-          path.join(__static, 'img/icons/play.png')
-        ),
-        click: () => {
-          win.webContents.send('play');
-        },
-      },
-      {
-        label: '上一首',
-        icon: nativeImage.createFromPath(
-          path.join(__static, 'img/icons/left.png')
-        ),
-        accelerator: 'CmdOrCtrl+Left',
-        click: () => {
-          win.webContents.send('previous');
-        },
-      },
-      {
-        label: '下一首',
-        icon: nativeImage.createFromPath(
-          path.join(__static, 'img/icons/right.png')
-        ),
-        accelerator: 'CmdOrCtrl+Right',
-        click: () => {
-          win.webContents.send('next');
-        },
-      },
-      {
-        label: '循环播放',
-        icon: nativeImage.createFromPath(
-          path.join(__static, 'img/icons/repeat.png')
-        ),
-        accelerator: 'Alt+R',
-        click: () => {
-          win.webContents.send('repeat');
-        },
-      },
-      {
-        label: '加入喜欢',
-        icon: nativeImage.createFromPath(
-          path.join(__static, 'img/icons/like.png')
-        ),
-        accelerator: 'CmdOrCtrl+L',
-        click: () => {
-          win.webContents.send('like');
-        },
-      },
-      {
-        label: '退出',
-        icon: nativeImage.createFromPath(
-          path.join(__static, 'img/icons/exit.png')
-        ),
-        accelerator: 'CmdOrCtrl+W',
-        click: () => {
-          app.exit();
-        },
-      },
-    ]);
+    tray.setContextMenu(contextMenu);
+  } else {
+    //windows and macos
+    tray.on('click', () => {
+      win.show();
+    });
 
-    tray.popUpContextMenu(contextMenu);
-  });
+    tray.on('right-click', () => {
+      tray.popUpContextMenu(contextMenu);
+    });
+  }
 
   return tray;
 }