[gtk+/wip/baedert/gtkimageview: 60/135] GtkImageView: Don't fix_anchor if fit_allocation is set...

[Timm Bäder <baedert src gnome org>]

commit 1d8596349519533aa99781071955b6372db9971b
Author: Timm Bäder <mail baedert org>
Date:   Sat Jan 23 12:15:56 2016 +0100

    GtkImageView: Don't fix_anchor if fit_allocation is set...
    
    ... and we're just changing the anchor.

 gtk/gtkimageview.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkimageview.c b/gtk/gtkimageview.c
index baa1a83..6a8e9fc 100644
--- a/gtk/gtkimageview.c
+++ b/gtk/gtkimageview.c
@@ -575,7 +575,6 @@ gesture_zoom_changed_cb (GtkGestureZoom *gesture,
 
   /* Don't emit */
   priv->scale = new_scale;
-  gtk_image_view_update_adjustments (image_view);
 
   gtk_image_view_set_scale_internal (image_view, new_scale);
 
@@ -676,7 +675,8 @@ gesture_rotate_changed_cb (GtkGestureRotate *gesture,
   priv->size_valid = FALSE;
   gtk_image_view_update_adjustments (image_view);
 
-  if (priv->hadjustment && priv->vadjustment)
+  if (priv->hadjustment && priv->vadjustment &&
+      !priv->fit_allocation)
     gtk_image_view_fix_anchor (image_view,
                                priv->anchor_x,
                                priv->anchor_y,