From 1ee301a407253a4d5855fdf1726fb80c30d6fa30 Mon Sep 17 00:00:00 2001 From: Vanessa Date: Fri, 24 Mar 2023 20:20:59 +0800 Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/7739 --- app/src/util/globalShortcut.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/util/globalShortcut.ts b/app/src/util/globalShortcut.ts index 4f72c95e5..1806372b2 100644 --- a/app/src/util/globalShortcut.ts +++ b/app/src/util/globalShortcut.ts @@ -545,7 +545,9 @@ export const globalShortcut = () => { if (item === window.siyuan.storage[Constants.LOCAL_ZOOM]) { window.siyuan.storage[Constants.LOCAL_ZOOM] = Constants.SIZE_ZOOM[index + 1] || 3; webFrame.setZoomFactor(window.siyuan.storage[Constants.LOCAL_ZOOM]); - setStorageVal(Constants.LOCAL_ZOOM, window.siyuan.storage[Constants.LOCAL_ZOOM]); + if (!isTabWindow) { + setStorageVal(Constants.LOCAL_ZOOM, window.siyuan.storage[Constants.LOCAL_ZOOM]); + } return true; } }); @@ -555,7 +557,9 @@ export const globalShortcut = () => { if (matchHotKey("⌘0", event)) { webFrame.setZoomFactor(1); window.siyuan.storage[Constants.LOCAL_ZOOM] = 1; - setStorageVal(Constants.LOCAL_ZOOM, 1); + if (!isTabWindow) { + setStorageVal(Constants.LOCAL_ZOOM, 1); + } event.preventDefault(); return; } @@ -564,7 +568,9 @@ export const globalShortcut = () => { if (item === window.siyuan.storage[Constants.LOCAL_ZOOM]) { window.siyuan.storage[Constants.LOCAL_ZOOM] = Constants.SIZE_ZOOM[index - 1] || 0.25; webFrame.setZoomFactor(window.siyuan.storage[Constants.LOCAL_ZOOM]); - setStorageVal(Constants.LOCAL_ZOOM, window.siyuan.storage[Constants.LOCAL_ZOOM]); + if (!isTabWindow) { + setStorageVal(Constants.LOCAL_ZOOM, window.siyuan.storage[Constants.LOCAL_ZOOM]); + } return true; } });