aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2014-02-28 23:34:30 +0800
committerMilan Crha <mcrha@redhat.com>2014-02-28 23:34:30 +0800
commite0acea237c219934f85c40694e5555b4108e5139 (patch)
tree57042b7de61a86794d65420b7a1d5a39ef6d10ee
parent47726556e0d11b2ab270a6f52afeefe9cf78742c (diff)
downloadgsoc2013-evolution-e0acea237c219934f85c40694e5555b4108e5139.tar
gsoc2013-evolution-e0acea237c219934f85c40694e5555b4108e5139.tar.gz
gsoc2013-evolution-e0acea237c219934f85c40694e5555b4108e5139.tar.bz2
gsoc2013-evolution-e0acea237c219934f85c40694e5555b4108e5139.tar.lz
gsoc2013-evolution-e0acea237c219934f85c40694e5555b4108e5139.tar.xz
gsoc2013-evolution-e0acea237c219934f85c40694e5555b4108e5139.tar.zst
gsoc2013-evolution-e0acea237c219934f85c40694e5555b4108e5139.zip
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.
-rw-r--r--e-util/e-web-view.c15
1 files 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 *