Fix accelerators (#1752)

* fix: accelerators with numbers

* fix: control zoom in

* fix logic on macOS

* fix for linux

* chore: prepare-code

* chore: adjust comments

1 files changed, 15 insertions, 2 deletions

diff --git a/src/lib/Menu.ts b/src/lib/Menu.ts
index bb8eead3a..8fd8e0a73 100644
--- a/src/lib/Menu.ts
+++ b/src/lib/Menu.ts
@@ -496,7 +496,15 @@ function titleBarTemplateFactory(
         },
         {
           label: intl.formatMessage(menuItems.zoomIn),
-          accelerator: `${cmdOrCtrlShortcutKey()}+plus`,
+          // TODO: Modify this logic once https://github.com/electron/electron/issues/40674 is fixed
+          // This is a workaround for the issue where the zoom in shortcut is not working
+          // This makes sure the accelerator is not registered
+          accelerator: isWindows
+            ? `${cmdOrCtrlShortcutKey()}++`
+            : `${cmdOrCtrlShortcutKey()}+Plus`,
+          registerAccelerator: !!isMac,
+          acceleratorWorksWhenHidden: !!isMac,
+          // ---------------------------
           click() {
             const activeService = getActiveService();
             if (!activeService) {
@@ -1134,7 +1142,12 @@ class FranzMenu implements StoresProps {
     for (const [i, service] of services.allDisplayed.entries()) {
       menu.push({
         label: this._getServiceName(service),
-        accelerator: acceleratorString(i + 1, cmdOrCtrlShortcutKey(), '', ''),
+        accelerator: acceleratorString({
+          index: i + 1,
+          keyCombo: cmdOrCtrlShortcutKey(),
+          prefix: '',
+          suffix: '',
+        }),
         type: 'radio',
         checked: service.isActive,
         click: () => {