From bd9f7deb985125b86de891122e0c19a87deaae98 Mon Sep 17 00:00:00 2001 From: Travis McLane Date: Wed, 23 Aug 2023 14:10:22 -0500 Subject: [PATCH] [v3 linux] correct minimum zoom --- v3/pkg/application/linux_cgo.go | 3 +++ v3/pkg/application/linux_purego.go | 4 +++- v3/pkg/application/webview_window_linux.go | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/v3/pkg/application/linux_cgo.go b/v3/pkg/application/linux_cgo.go index d83ee3b3c..aebe55c49 100644 --- a/v3/pkg/application/linux_cgo.go +++ b/v3/pkg/application/linux_cgo.go @@ -765,6 +765,9 @@ func windowZoomOut(webview pointer) { } func windowZoomSet(webview pointer, zoom float64) { + if zoom < 1 { // 1.0 is the smallest allowable + zoom = 1 + } C.webkit_web_view_set_zoom_level((*C.WebKitWebView)(webview), C.double(zoom)) } diff --git a/v3/pkg/application/linux_purego.go b/v3/pkg/application/linux_purego.go index bfb6a8d07..9e930bb9b 100644 --- a/v3/pkg/application/linux_purego.go +++ b/v3/pkg/application/linux_purego.go @@ -947,7 +947,6 @@ func windowZoom(webview pointer) float64 { return webkitWebViewGetZoom(webview) } -// FIXME: ZoomIn/Out is assumed to be incorrect! func windowZoomIn(webview pointer) { ZoomInFactor := 1.10 windowZoomSet(webview, windowZoom(webview)*ZoomInFactor) @@ -958,6 +957,9 @@ func windowZoomOut(webview pointer) { } func windowZoomSet(webview pointer, zoom float64) { + if zoom < 1.0 { // 1.0 is the smallest allowable + zoom = 1.0 + } webkitWebViewSetZoomLevel(webview, zoom) } diff --git a/v3/pkg/application/webview_window_linux.go b/v3/pkg/application/webview_window_linux.go index cb7ce0ded..eaa65d550 100644 --- a/v3/pkg/application/webview_window_linux.go +++ b/v3/pkg/application/webview_window_linux.go @@ -210,7 +210,7 @@ func (w *linuxWebviewWindow) zoomOut() { } func (w *linuxWebviewWindow) zoomReset() { - windowZoomSet(w.webview, 0.0) + windowZoomSet(w.webview, 1.0) } func (w *linuxWebviewWindow) reload() {