]> spindle.queued.net Git - midori/commitdiff
Allow image zoom if text and images can be zoomed
authorChristian Dywan <christian@twotoasts.de>
Wed, 5 Jan 2011 18:21:50 +0000 (19:21 +0100)
committerChristian Dywan <christian@twotoasts.de>
Wed, 5 Jan 2011 18:21:50 +0000 (19:21 +0100)
midori/midori-view.c

index 2efc0a801eec94791cdb3e148df73e99dd340c20..34502a076b42a7679ad4474fd4cb4f1ab59ce381 100644 (file)
@@ -4703,7 +4703,9 @@ midori_view_can_zoom_in (MidoriView* view)
 {
     g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
 
-    return view->web_view != NULL && !g_str_has_prefix (view->mime_type, "image/");
+    return view->web_view != NULL
+        && (katze_object_get_boolean (view->settings, "zoom-text-and-images")
+        || !g_str_has_prefix (view->mime_type, "image/"));
 }
 
 gboolean
@@ -4711,7 +4713,9 @@ midori_view_can_zoom_out (MidoriView* view)
 {
     g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
 
-    return view->web_view != NULL && !g_str_has_prefix (view->mime_type, "image/");
+    return view->web_view != NULL
+        && (katze_object_get_boolean (view->settings, "zoom-text-and-images")
+        || !g_str_has_prefix (view->mime_type, "image/"));
 }
 
 gboolean