Show context menu when clicking menubar icon by default (#106)

package.json

@@ -34,7 +34,7 @@
     "fs-extra": "8.1.0",
     "is-url": "1.2.4",
     "jimp": "0.6.8",
-    "menubar": "6.0.8",
+    "menubar": "7.1.0",
     "node-fetch": "2.6.0",
     "request": "2.88.0",
     "request-promise-native": "1.0.8",

patches/menubar+7.1.0.patch

@@ -1,8 +1,8 @@
 diff --git a/node_modules/menubar/lib/Menubar.js b/node_modules/menubar/lib/Menubar.js
-index 2fc8feb..5a903e0 100644
+index ee94dbf..63f8dfc 100644
 --- a/node_modules/menubar/lib/Menubar.js
 +++ b/node_modules/menubar/lib/Menubar.js
-@@ -239,7 +239,10 @@ var Menubar = /** @class */ (function (_super) {
+@@ -237,7 +237,10 @@ var Menubar = /** @class */ (function (_super) {
                          }
                          // `.setPosition` crashed on non-integers
                          // https://github.com/maxogden/menubar/issues/233

public/windows/main.js

@@ -35,6 +35,8 @@ const createAsync = () => {
       index: REACT_PATH,
       icon: path.resolve(__dirname, '..', 'menubarTemplate.png'),
       preloadWindow: true,
+      showOnRightClick: true,
+      tooltip: 'Singlebox',
       browserWindow: {
         x: menubarWindowState.x,
         y: menubarWindowState.y,
@@ -62,73 +64,81 @@ const createAsync = () => {
         });
 
         mb.on('ready', () => {
-          const registered = getPreference('registered');
-          const updaterEnabled = process.env.SNAP == null && !process.mas && !process.windowsStore;
+          mb.tray.on('click', () => {
+            const registered = getPreference('registered');
+            const updaterEnabled = process.env.SNAP == null
+              && !process.mas && !process.windowsStore;
 
-          const updaterMenuItem = {
-            label: 'Check for Updates...',
-            click: () => {
-              global.updateSilent = false;
-              autoUpdater.checkForUpdates();
-            },
-            visible: updaterEnabled,
-          };
-          if (global.updateDownloaded) {
-            updaterMenuItem.label = 'Restart to Apply Updates...';
-            updaterMenuItem.click = () => {
-              setImmediate(() => {
-                app.removeAllListeners('window-all-closed');
-                if (get() != null) {
-                  get().forceClose = true;
-                  get().close();
-                }
-                autoUpdater.quitAndInstall(false);
-              });
-            };
-          } else if (global.updaterProgressObj) {
-            const { transferred, total, bytesPerSecond } = global.updaterProgressObj;
-            updaterMenuItem.label = `Downloading Updates (${formatBytes(transferred)}/${formatBytes(total)} at ${formatBytes(bytesPerSecond)}/s)...`;
-            updaterMenuItem.enabled = false;
-          }
-
-          const contextMenu = Menu.buildFromTemplate([
-            {
-              label: 'About Singlebox',
-              click: () => ipcMain.emit('request-show-about-window'),
-            },
-            { type: 'separator' },
-            {
-              label: registered ? 'Registered' : 'Registration...',
-              enabled: !registered,
-              click: registered ? null : () => ipcMain.emit('request-show-license-registration-window'),
-            },
-            { type: 'separator' },
-            updaterMenuItem,
-            { type: 'separator' },
-            {
-              label: 'Preferences...',
-              click: () => ipcMain.emit('request-show-preferences-window'),
-            },
-            { type: 'separator' },
-            {
-              label: 'Notifications...',
-              click: () => ipcMain.emit('request-show-notifications-window'),
-            },
-            { type: 'separator' },
-            {
-              label: 'Clear Browsing Data...',
-              click: () => ipcMain.emit('request-clear-browsing-data'),
-            },
-            { type: 'separator' },
-            {
-              role: 'quit',
+            const updaterMenuItem = {
+              label: 'Check for Updates...',
               click: () => {
-                mb.app.quit();
+                global.updateSilent = false;
+                autoUpdater.checkForUpdates();
               },
-            },
-          ]);
+              visible: updaterEnabled,
+            };
+            if (global.updateDownloaded) {
+              updaterMenuItem.label = 'Restart to Apply Updates...';
+              updaterMenuItem.click = () => {
+                setImmediate(() => {
+                  app.removeAllListeners('window-all-closed');
+                  if (get() != null) {
+                    get().forceClose = true;
+                    get().close();
+                  }
+                  autoUpdater.quitAndInstall(false);
+                });
+              };
+            } else if (global.updaterProgressObj) {
+              const { transferred, total, bytesPerSecond } = global.updaterProgressObj;
+              updaterMenuItem.label = `Downloading Updates (${formatBytes(transferred)}/${formatBytes(total)} at ${formatBytes(bytesPerSecond)}/s)...`;
+              updaterMenuItem.enabled = false;
+            }
+
+            const contextMenu = Menu.buildFromTemplate([
+              {
+                label: 'Open Singlebox',
+                click: () => mb.showWindow(),
+              },
+              {
+                type: 'separator',
+              },
+              {
+                label: 'About Singlebox',
+                click: () => ipcMain.emit('request-show-about-window'),
+              },
+              { type: 'separator' },
+              {
+                label: registered ? 'Registered' : 'Registration...',
+                enabled: !registered,
+                click: registered ? null : () => ipcMain.emit('request-show-license-registration-window'),
+              },
+              { type: 'separator' },
+              updaterMenuItem,
+              { type: 'separator' },
+              {
+                label: 'Preferences...',
+                click: () => ipcMain.emit('request-show-preferences-window'),
+              },
+              { type: 'separator' },
+              {
+                label: 'Notifications...',
+                click: () => ipcMain.emit('request-show-notifications-window'),
+              },
+              { type: 'separator' },
+              {
+                label: 'Clear Browsing Data...',
+                click: () => ipcMain.emit('request-clear-browsing-data'),
+              },
+              { type: 'separator' },
+              {
+                role: 'quit',
+                click: () => {
+                  mb.app.quit();
+                },
+              },
+            ]);
 
-          mb.tray.on('right-click', () => {
             mb.tray.popUpContextMenu(contextMenu);
           });
 

yarn.lock

@@ -8568,10 +8568,10 @@ memory-fs@^0.5.0:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-menubar@6.0.8:
-  version "6.0.8"
-  resolved "https://registry.yarnpkg.com/menubar/-/menubar-6.0.8.tgz#deff4b4227c73149f6316c481accb1486e7c9e7f"
-  integrity sha512-S02SLiqec8MAUbV2vsUThh0P9XPKS9mrHVN3c/6T1g+tuHwFX7TRup3xCAjIGCO+Hxs32tWmjqVh4KjBGIXudQ==
+menubar@7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/menubar/-/menubar-7.1.0.tgz#c92d75e78fcce6da39fced936ad75c94009699df"
+  integrity sha512-B7ITYPW0oNu5NSjaYTt9ExL6GRMVb9p+ryW+c/4Rg1/EErmDGJhwCZavnV2roGJApNiFahymHsaG9yRq2iMCkw==
   dependencies:
     electron-positioner "^4.1.0"