Merge pull request #70 from arthyn/fix/zoom-slightly-off

Fix zoom
latter-bolden · May 6, 2021 · e3c0b1f · e3c0b1f
2 parents 6f93f97 + 28dc5f0
commit e3c0b1f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "taisho",
   "productName": "taisho",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "A ship runner and manager for Urbit OS",
   "repository": {
     "type": "git",

diff --git a/src/main/main-window.ts b/src/main/main-window.ts
@@ -58,11 +58,11 @@ export function createMainWindow(
 
   mainWindowState.manage(mainWindow);
 
-  const withFocusedView = (block: (contents: WebContents) => void): void => {
+  const withFocusedView = (block: (contents: WebContents) => void, onlyWindow = false): void => {
     const focusedWindow = BrowserWindow.getFocusedWindow();
     if (focusedWindow) {
       const contents = getWindowOrViewContents(focusedWindow);
-      return block(contents);
+      return onlyWindow ? block(focusedWindow.webContents) : block(contents);
     }
     return undefined;
   };
@@ -75,21 +75,17 @@ export function createMainWindow(
   };
 
   const onZoomIn = (): void => {
-    withFocusedView((contents: WebContents) =>
-      adjustZoom(contents, ZOOM_INTERVAL),
-    );
+    withFocusedView((contents: WebContents) => adjustZoom(contents, ZOOM_INTERVAL), true);
   };
 
   const onZoomOut = (): void => {
-    withFocusedView((contents: WebContents) =>
-      adjustZoom(contents, -ZOOM_INTERVAL),
-    );
+    withFocusedView((contents: WebContents) => adjustZoom(contents, -ZOOM_INTERVAL), true);
   };
 
   const onZoomReset = (): void => {
     withFocusedView((contents: WebContents) => {
       contents.zoomFactor = 1;
-    });
+    }, true);
   };
 
   const clearAppData = async (): Promise<void> => {