From e0acea237c219934f85c40694e5555b4108e5139 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 28 Feb 2014 16:34:30 +0100 Subject: EWebView: Limit zoom-in/zoom-out to 0.1 .. 5.0 values It doesn't make much sense to zoom below 0.1, same as zoom 5.0 is quite large, thus no need to zoom indefinitely in both directions. --- e-util/e-web-view.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c index 8e8f852fbb..2578590b3f 100644 --- a/e-util/e-web-view.c +++ b/e-util/e-web-view.c @@ -634,8 +634,13 @@ web_view_load_status_changed_cb (WebKitWebView *webkit_web_view, /* Workaround webkit bug: * https://bugs.webkit.org/show_bug.cgi?id=89553 */ - e_web_view_zoom_in (web_view); - e_web_view_zoom_out (web_view); + if (webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) > 0.9999) { + e_web_view_zoom_out (web_view); + e_web_view_zoom_in (web_view); + } else { + e_web_view_zoom_in (web_view); + e_web_view_zoom_out (web_view); + } } static void @@ -2416,7 +2421,8 @@ e_web_view_zoom_in (EWebView *web_view) { g_return_if_fail (E_IS_WEB_VIEW (web_view)); - webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (web_view)); + if (webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) < 4.9999) + webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (web_view)); } void @@ -2424,7 +2430,8 @@ e_web_view_zoom_out (EWebView *web_view) { g_return_if_fail (E_IS_WEB_VIEW (web_view)); - webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (web_view)); + if (webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) > 0.1999) + webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (web_view)); } GtkUIManager * -- cgit v1.2.3