Merge pull request #131 from plebbit/development

Development

electron/main.js

@@ -206,8 +206,6 @@ const createMainWindow = () => {
     tray.on('right-click', () => {
       mainWindow.isVisible() ? mainWindow.hide() : mainWindow.show();
     });
-  }
-  
 
     // close to tray
     if (!isDev) {
@@ -223,33 +221,42 @@ const createMainWindow = () => {
         }
       });
     }
+  }
 
   // application menu
   // hide useless electron help menu
+  if (process.platform === 'darwin') {
+    const appMenu = Menu.getApplicationMenu();
+    appMenu.insert(1, appMenuBack);
+    appMenu.insert(2, appMenuForward);
+    appMenu.insert(3, appMenuReload);
+    Menu.setApplicationMenu(appMenu);
+  } else {
+    // Other platforms
     const originalAppMenuWithoutHelp = Menu.getApplicationMenu()?.items.filter(
       (item) => item.role !== 'help'
     );
-  const appMenu = new Menu();
+    const appMenu = [appMenuBack, appMenuForward, appMenuReload, ...originalAppMenuWithoutHelp];
-  appMenu.append(new MenuItem({role: 'appMenu'}));
+    Menu.setApplicationMenu(Menu.buildFromTemplate(appMenu));
-  appMenu.append(new MenuItem({
+  }
+  
+  const appMenuBack = new MenuItem({
     label: '←',
     enabled: mainWindow?.webContents?.canGoBack(),
     click: () => mainWindow?.webContents?.goBack(),
-  }));
+  });
-  appMenu.append(new MenuItem({
+  const appMenuForward = new MenuItem({
     label: '→',
     enabled: mainWindow?.webContents?.canGoForward(),
     click: () => mainWindow?.webContents?.goForward(),
-  }));
+  });
-  appMenu.append(new MenuItem({
+  const appMenuReload = new MenuItem({
     label: '⟳',
     role: 'reload',
     click: () => mainWindow?.webContents?.reload(),
-  }));
-  originalAppMenuWithoutHelp.forEach(item => {
-    appMenu.append(item);
   });
-  Menu.setApplicationMenu(appMenu);
+};
+
 
 
 app.whenReady().then(() => {
@@ -267,4 +274,3 @@ const createMainWindow = () => {
     app.quit();
   }
 });
-};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "plebchan",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "private": true,
   "dependencies": {
     "@adraffy/ens-normalize": "1.8.3",