Merge remote-tracking branch 'origin/fix/service-zoom' into develop

2 files changed, 42 insertions, 8 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index c378619ad..dce8ab969 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -239,16 +239,32 @@ const _templateFactory = intl => [
       },
       {
         label: intl.formatMessage(menuItems.resetZoom),
-        role: 'resetzoom',
+        accelerator: 'Cmd+0',
+        click() {
+          getActiveWebview().setZoomLevel(0);
+        },
       },
       {
         label: intl.formatMessage(menuItems.zoomIn),
-        // accelerator: 'Cmd+=',
-        role: 'zoomin',
+        accelerator: 'Cmd+plus',
+        click() {
+          const activeService = getActiveWebview();
+          activeService.getZoomLevel((level) => {
+            // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
+            if (level < 9) activeService.setZoomLevel(level + 1);
+          });
+        },
       },
       {
         label: intl.formatMessage(menuItems.zoomOut),
-        role: 'zoomout',
+        accelerator: 'Cmd+-',
+        click() {
+          const activeService = getActiveWebview();
+          activeService.getZoomLevel((level) => {
+            // level -9 =~ -50% and setZoomLevel wouldnt zoom out further
+            if (level > -9) activeService.setZoomLevel(level - 1);
+          });
+        },
       },
       {
         type: 'separator',
@@ -394,8 +410,10 @@ const _titleBarTemplateFactory = intl => [
         label: intl.formatMessage(menuItems.zoomIn),
         accelerator: `${ctrlKey}+Plus`,
         click() {
-          getActiveWebview().getZoomLevel((zoomLevel) => {
-            getActiveWebview().setZoomLevel(zoomLevel === 5 ? zoomLevel : zoomLevel + 1);
+          const activeService = getActiveWebview();
+          activeService.getZoomLevel((level) => {
+            // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
+            if (level < 9) activeService.setZoomLevel(level + 1);
           });
         },
       },
@@ -403,8 +421,10 @@ const _titleBarTemplateFactory = intl => [
         label: intl.formatMessage(menuItems.zoomOut),
         accelerator: `${ctrlKey}+-`,
         click() {
-          getActiveWebview().getZoomLevel((zoomLevel) => {
-            getActiveWebview().setZoomLevel(zoomLevel === -5 ? zoomLevel : zoomLevel - 1);
+          const activeService = getActiveWebview();
+          activeService.getZoomLevel((level) => {
+            // level -9 =~ -50% and setZoomLevel wouldnt zoom out further
+            if (level > -9) activeService.setZoomLevel(level - 1);
           });
         },
       },
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index f9009af5a..d933ca407 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -178,6 +178,20 @@ export default class AppStore extends Store {
       },
     );
 
+    // We need to add an additional key listener for ctrl+ on windows. Otherwise only ctrl+shift+ would work
+    if (isWindows) {
+      key(
+        'ctrl+=', () => {
+          debug('Windows: zoom in via ctrl+');
+          const { webview } = this.stores.services.active;
+          webview.getZoomLevel((level) => {
+            // level 9 =~ +300% and setZoomLevel wouldnt zoom in further
+            if (level < 9) webview.setZoomLevel(level + 1);
+          });
+        },
+      );
+    }
+
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();