fix: After zoom/reset navigating displays "white screen" (#1947)

Co-authored-by: André Pesci Cazetto <[email protected]> Co-authored-by: Guilherme Gazzo <[email protected]>
RocketChat · Sep 14, 2021 · a1323df · a1323df
1 parent bc7c0e5
commit a1323df
Showing 1 changed file with 32 additions and 7 deletions.
diff --git a/src/ui/main/menuBar.ts b/src/ui/main/menuBar.ts
@@ -352,7 +352,12 @@ const createViewMenu = createSelector(
             browserWindow.showInactive();
           }
           browserWindow.focus();
-          browserWindow.webContents.zoomLevel = 0;
+          const url = typeof currentView === 'object' ? currentView.url : null;
+          if (!url) {
+            return;
+          }
+          const guestWebContents = getWebContentsByServerUrl(url);
+          guestWebContents?.setZoomLevel(0);
         },
       },
       {
@@ -361,15 +366,24 @@ const createViewMenu = createSelector(
         accelerator: 'CommandOrControl+Plus',
         click: async () => {
           const browserWindow = await getRootWindow();
-
           if (!browserWindow.isVisible()) {
             browserWindow.showInactive();
           }
           browserWindow.focus();
-          if (browserWindow.webContents.zoomLevel >= 9) {
+          const url = typeof currentView === 'object' ? currentView.url : null;
+          if (!url) {
+            return;
+          }
+          const guestWebContents = getWebContentsByServerUrl(url);
+          if (!guestWebContents) {
+            return;
+          }
+          const zoomLevel = guestWebContents?.getZoomLevel();
+          if (zoomLevel >= 9) {
             return;
           }
-          browserWindow.webContents.zoomLevel++;
+
+          guestWebContents.setZoomLevel(zoomLevel + 1);
         },
       },
       {
@@ -378,15 +392,26 @@ const createViewMenu = createSelector(
         accelerator: 'CommandOrControl+-',
         click: async () => {
           const browserWindow = await getRootWindow();
-
           if (!browserWindow.isVisible()) {
             browserWindow.showInactive();
           }
           browserWindow.focus();
-          if (browserWindow.webContents.zoomLevel <= -9) {
+          const url = typeof currentView === 'object' ? currentView.url : null;
+          if (!url) {
+            return;
+          }
+
+          const guestWebContents = getWebContentsByServerUrl(url);
+          if (!guestWebContents) {
             return;
           }
-          browserWindow.webContents.zoomLevel--;
+
+          const zoomLevel = guestWebContents.getZoomLevel();
+          if (zoomLevel <= -9) {
+            return;
+          }
+
+          guestWebContents.setZoomLevel(zoomLevel - 1);
         },
       },
     ],