[Xfce4-commits] <ristretto:master> Improve zooming

[Stephan Arts]

Updating branch refs/heads/master
         to 5619251ec2172f48f119fcdd2ece3dffc2e203b6 (commit)
       from c17d4a6b7b9a80876f253434213e0c4c9134ec9e (commit)

commit 5619251ec2172f48f119fcdd2ece3dffc2e203b6
Author: Stephan Arts <stephan at xfce.org>
Date:   Fri Jul 29 19:51:03 2011 +0200

    Improve zooming

 src/image_viewer.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/src/image_viewer.c b/src/image_viewer.c
index 3aa46a5..3251939 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -825,9 +825,9 @@ rstto_image_viewer_set_scale (RsttoImageViewer *viewer, gdouble scale)
             /*
              * Assuming image_scale == 1.0
              */
-
             gdouble v_scale = (gdouble)(GTK_WIDGET (viewer)->allocation.height) / (gdouble)viewer->priv->image_height;
             gdouble h_scale = (gdouble)(GTK_WIDGET (viewer)->allocation.width) / (gdouble)viewer->priv->image_width;
+
             if ((h_scale > RSTTO_MAX_SCALE) || (v_scale > RSTTO_MAX_SCALE))
             {
                 if(h_scale < v_scale)
@@ -845,6 +845,13 @@ rstto_image_viewer_set_scale (RsttoImageViewer *viewer, gdouble scale)
                     }
                 }
             }
+            else
+            {
+                if (scale > RSTTO_MAX_SCALE)
+                {
+                    scale = RSTTO_MAX_SCALE;
+                }
+            }
         }
 
         /*
@@ -1333,6 +1340,7 @@ cb_rstto_image_viewer_scroll_event (RsttoImageViewer *viewer, GdkEventScroll *ev
 
                 gdouble v_scale = (gdouble)(GTK_WIDGET (viewer)->allocation.height) / (gdouble)viewer->priv->image_height;
                 gdouble h_scale = (gdouble)(GTK_WIDGET (viewer)->allocation.width) / (gdouble)viewer->priv->image_width;
+
                 if ((h_scale > RSTTO_MAX_SCALE) || (v_scale > RSTTO_MAX_SCALE))
                 {
                     if(h_scale < v_scale)
@@ -1350,6 +1358,14 @@ cb_rstto_image_viewer_scroll_event (RsttoImageViewer *viewer, GdkEventScroll *ev
                         }
                     }
                 }
+                else
+                {
+                    if (scale > RSTTO_MAX_SCALE)
+                    {
+                        scale = RSTTO_MAX_SCALE;
+                    }
+
+                }
             }
 
             /*