broadcast zoom changed notifications

Author: sawka

emain/emain-menu.ts

@@ -9,7 +9,7 @@ import { focusedBuilderWindow, getBuilderWindowById } from "./emain-builder";
 import { openBuilderWindow } from "./emain-ipc";
 import { isDev, unamePlatform } from "./emain-platform";
 import { clearTabCache } from "./emain-tabview";
-import { decreaseZoomLevel, increaseZoomLevel } from "./emain-util";
+import { decreaseZoomLevel, increaseZoomLevel, resetZoomLevel } from "./emain-util";
 import {
     createNewWaveWindow,
     createWorkspace,
@@ -238,8 +238,7 @@ function makeViewMenu(
             click: (_, window) => {
                 const wc = getWindowWebContents(window) ?? webContents;
                 if (wc) {
-                    wc.setZoomFactor(1);
-                    wc.send("zoom-factor-change", 1);
+                    resetZoomLevel(wc);
                 }
             },
         },

emain/emain-tabview.ts

@@ -15,6 +15,7 @@ import {
     handleCtrlShiftFocus,
     handleCtrlShiftState,
     increaseZoomLevel,
+    resetZoomLevel,
     shFrameNavHandler,
     shNavHandler,
 } from "./emain-util";
@@ -48,8 +49,7 @@ function handleWindowsMenuAccelerators(
     }
 
     if (checkKeyPressed(waveEvent, "Ctrl:0")) {
-        tabView.webContents.setZoomFactor(1);
-        tabView.webContents.send("zoom-factor-change", 1);
+        resetZoomLevel(tabView.webContents);
         return true;
     }
 
@@ -165,7 +165,7 @@ export class WaveTabView extends WebContentsView {
             removeWaveTabView(this.waveTabId);
             this.isDestroyed = true;
         });
-        this.webContents.on("zoom-changed", (_event, zoomDirection) => {
+        this.webContents.on("zoom-changed", (_event, _zoomDirection) => {
             this.webContents.send("zoom-factor-change", this.webContents.getZoomFactor());
         });
         this.setBackgroundColor(computeBgColor(fullConfig));
@@ -339,9 +339,6 @@ export async function getOrCreateWebViewForTab(waveWindowId: string, tabId: stri
             }
         }
     });
-    tabView.webContents.on("zoom-changed", (e) => {
-        tabView.webContents.send("zoom-changed");
-    });
     tabView.webContents.setWindowOpenHandler(({ url, frameName }) => {
         if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("file://")) {
             console.log("openExternal fallback", url);

emain/emain-util.ts

@@ -12,16 +12,30 @@ const MinZoomLevel = 0.4;
 const MaxZoomLevel = 2.6;
 const ZoomDelta = 0.2;
 
+function broadcastZoomFactorChanged(newZoomFactor: number): void {
+    for (const wc of electron.webContents.getAllWebContents()) {
+        if (wc.isDestroyed()) {
+            continue;
+        }
+        wc.send("zoom-factor-change", newZoomFactor);
+    }
+}
+
 export function increaseZoomLevel(webContents: electron.WebContents): void {
     const newZoom = Math.min(MaxZoomLevel, webContents.getZoomFactor() + ZoomDelta);
     webContents.setZoomFactor(newZoom);
-    webContents.send("zoom-factor-change", newZoom);
+    broadcastZoomFactorChanged(newZoom);
 }
 
 export function decreaseZoomLevel(webContents: electron.WebContents): void {
     const newZoom = Math.max(MinZoomLevel, webContents.getZoomFactor() - ZoomDelta);
     webContents.setZoomFactor(newZoom);
-    webContents.send("zoom-factor-change", newZoom);
+    broadcastZoomFactorChanged(newZoom);
+}
+
+export function resetZoomLevel(webContents: electron.WebContents): void {
+    webContents.setZoomFactor(1);
+    broadcastZoomFactorChanged(1);
 }
 
 export function getElectronExecPath(): string {