From f67cecf1b4eaff1d5a463ef5312a63e09118670a Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Tue, 3 Sep 2024 14:37:44 -0700 Subject: [PATCH] Fix interface zoom --- src-tauri/yaak_models/src/models.rs | 2 +- src-web/components/GlobalHooks.tsx | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src-tauri/yaak_models/src/models.rs b/src-tauri/yaak_models/src/models.rs index 1f2f95f6..0bdd04bc 100644 --- a/src-tauri/yaak_models/src/models.rs +++ b/src-tauri/yaak_models/src/models.rs @@ -20,7 +20,7 @@ pub struct Settings { pub theme_light: String, pub update_channel: String, pub interface_font_size: i32, - pub interface_scale: i32, + pub interface_scale: f32, pub editor_font_size: i32, pub editor_soft_wrap: bool, pub telemetry: bool, diff --git a/src-web/components/GlobalHooks.tsx b/src-web/components/GlobalHooks.tsx index 733b9baa..50bca895 100644 --- a/src-web/components/GlobalHooks.tsx +++ b/src-web/components/GlobalHooks.tsx @@ -162,15 +162,16 @@ export function GlobalHooks() { document.documentElement.style.setProperty('--editor-font-size', `${editorFontSize}px`); }, [settings]); - // Handle Zoom. Note, Mac handles it in app menu, so need to also handle keyboard + // Handle Zoom. + // Note, Mac handles it in the app menu, so need to also handle keyboard // shortcuts for Windows/Linux const zoom = useZoom(); - useHotKey('app.zoom_in', () => zoom.zoomIn); - useListenToTauriEvent('zoom_in', () => zoom.zoomIn); - useHotKey('app.zoom_out', () => zoom.zoomOut); - useListenToTauriEvent('zoom_out', () => zoom.zoomOut); - useHotKey('app.zoom_reset', () => zoom.zoomReset); - useListenToTauriEvent('zoom_reset', () => zoom.zoomReset); + useHotKey('app.zoom_in', zoom.zoomIn); + useListenToTauriEvent('zoom_in', zoom.zoomIn); + useHotKey('app.zoom_out', zoom.zoomOut); + useListenToTauriEvent('zoom_out', zoom.zoomOut); + useHotKey('app.zoom_reset', zoom.zoomReset); + useListenToTauriEvent('zoom_reset', zoom.zoomReset); const copy = useCopy(); useListenToTauriEvent('generate_theme_css', () => {