|
 |
7c6d83 |
diff -up evolution-3.8.5/e-util/e-web-view.c.ewebview-limit-zoom evolution-3.8.5/e-util/e-web-view.c
|
|
|
7c6d83 |
--- evolution-3.8.5/e-util/e-web-view.c.ewebview-limit-zoom 2014-12-01 13:22:53.124559330 +0100
|
|
|
7c6d83 |
+++ evolution-3.8.5/e-util/e-web-view.c 2014-12-01 13:23:44.638597493 +0100
|
|
|
7c6d83 |
@@ -472,8 +472,13 @@ web_view_load_status_changed_cb (WebKitW
|
|
|
7c6d83 |
web_view_update_document_highlights (web_view);
|
|
|
7c6d83 |
|
|
|
7c6d83 |
/* Workaround webkit bug https://bugs.webkit.org/show_bug.cgi?id=89553 */
|
|
|
7c6d83 |
- e_web_view_zoom_in (web_view);
|
|
|
7c6d83 |
- e_web_view_zoom_out (web_view);
|
|
|
7c6d83 |
+ if (webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) > 0.9999) {
|
|
|
7c6d83 |
+ e_web_view_zoom_out (web_view);
|
|
|
7c6d83 |
+ e_web_view_zoom_in (web_view);
|
|
|
7c6d83 |
+ } else {
|
|
|
7c6d83 |
+ e_web_view_zoom_in (web_view);
|
|
|
7c6d83 |
+ e_web_view_zoom_out (web_view);
|
|
|
7c6d83 |
+ }
|
|
|
7c6d83 |
}
|
|
|
7c6d83 |
|
|
|
7c6d83 |
static void
|
|
|
7c6d83 |
@@ -2494,7 +2499,8 @@ e_web_view_zoom_in (EWebView *web_view)
|
|
|
7c6d83 |
{
|
|
|
7c6d83 |
g_return_if_fail (E_IS_WEB_VIEW (web_view));
|
|
|
7c6d83 |
|
|
|
7c6d83 |
- webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (web_view));
|
|
|
7c6d83 |
+ if (webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) < 4.9999)
|
|
|
7c6d83 |
+ webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (web_view));
|
|
|
7c6d83 |
}
|
|
|
7c6d83 |
|
|
|
7c6d83 |
void
|
|
|
7c6d83 |
@@ -2502,7 +2508,8 @@ e_web_view_zoom_out (EWebView *web_view)
|
|
|
7c6d83 |
{
|
|
|
7c6d83 |
g_return_if_fail (E_IS_WEB_VIEW (web_view));
|
|
|
7c6d83 |
|
|
|
7c6d83 |
- webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (web_view));
|
|
|
7c6d83 |
+ if (webkit_web_view_get_zoom_level (WEBKIT_WEB_VIEW (web_view)) > 0.7999)
|
|
|
7c6d83 |
+ webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (web_view));
|
|
|
7c6d83 |
}
|
|
|
7c6d83 |
|
|
|
7c6d83 |
GtkUIManager *
|
|
|
7c6d83 |
diff -up evolution-3.8.5/mail/e-mail-reader.c.ewebview-limit-zoom evolution-3.8.5/mail/e-mail-reader.c
|
|
|
7c6d83 |
--- evolution-3.8.5/mail/e-mail-reader.c.ewebview-limit-zoom 2014-12-01 13:23:34.278759905 +0100
|
|
|
7c6d83 |
+++ evolution-3.8.5/mail/e-mail-reader.c 2014-12-01 13:23:44.639597455 +0100
|
|
|
7c6d83 |
@@ -1864,7 +1864,7 @@ action_mail_zoom_100_cb (GtkAction *acti
|
|
|
7c6d83 |
|
|
|
7c6d83 |
display = e_mail_reader_get_mail_display (reader);
|
|
|
7c6d83 |
|
|
|
7c6d83 |
- webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW (display), 1.0);
|
|
|
7c6d83 |
+ e_web_view_zoom_100 (E_WEB_VIEW (display));
|
|
|
7c6d83 |
}
|
|
|
7c6d83 |
|
|
|
7c6d83 |
static void
|
|
|
7c6d83 |
@@ -1875,7 +1875,7 @@ action_mail_zoom_in_cb (GtkAction *actio
|
|
|
7c6d83 |
|
|
|
7c6d83 |
display = e_mail_reader_get_mail_display (reader);
|
|
|
7c6d83 |
|
|
|
7c6d83 |
- webkit_web_view_zoom_in (WEBKIT_WEB_VIEW (display));
|
|
|
7c6d83 |
+ e_web_view_zoom_in (E_WEB_VIEW (display));
|
|
|
7c6d83 |
}
|
|
|
7c6d83 |
|
|
|
7c6d83 |
static void
|
|
|
7c6d83 |
@@ -1886,7 +1886,7 @@ action_mail_zoom_out_cb (GtkAction *acti
|
|
|
7c6d83 |
|
|
|
7c6d83 |
display = e_mail_reader_get_mail_display (reader);
|
|
|
7c6d83 |
|
|
|
7c6d83 |
- webkit_web_view_zoom_out (WEBKIT_WEB_VIEW (display));
|
|
|
7c6d83 |
+ e_web_view_zoom_out (E_WEB_VIEW (display));
|
|
|
7c6d83 |
}
|
|
|
7c6d83 |
|
|
|
7c6d83 |
static void
|