From 4068497120702be75b51cb5c43bf400b263251df Mon Sep 17 00:00:00 2001
From: Ronan Jouchet <ronan@jouchet.fr>
Date: Wed, 18 Mar 2020 08:51:46 -0400
Subject: [PATCH] App/menu: back & forward: expose standard shortcuts first &
 handle mac, keep old weird shortcuts for backward compat

---
 app/src/components/menu.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/components/menu.ts b/app/src/components/menu.ts
index ff88ec0..7b2874c 100644
--- a/app/src/components/menu.ts
+++ b/app/src/components/menu.ts
@@ -86,16 +86,20 @@ export function createMenu({
       {
         label: 'Back',
         accelerator: (() => {
-          globalShortcut.register('Alt+Left', goBack);
-          return 'CmdOrCtrl+[';
+          globalShortcut.register('CmdOrCtrl+[', goBack); // Used in old versions of Nativefier, kept for backwards compat.
+          const backKbShortcut =
+            process.platform === 'darwin' ? 'Cmd+Left' : 'Alt+Left';
+          return backKbShortcut;
         })(),
         click: goBack,
       },
       {
         label: 'Forward',
         accelerator: (() => {
-          globalShortcut.register('Alt+Right', goForward);
-          return 'CmdOrCtrl+]';
+          globalShortcut.register('CmdOrCtrl+]', goForward); // Used in old versions of Nativefier, kept for backwards compat.
+          const forwardKbShortcut =
+            process.platform === 'darwin' ? 'Cmd+Right' : 'Alt+Right';
+          return forwardKbShortcut;
         })(),
         click: goForward,
       },