[eog/wip/baedert/gtkimageview: 69/75] scroll-view: Disable transtions when changing the image



commit a96a10ad45fc2a986f316c77d0807e237d07c6d8
Author: Timm Bäder <mail baedert org>
Date:   Sat Mar 19 14:12:50 2016 +0100

    scroll-view: Disable transtions when changing the image

 src/eog-scroll-view.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/src/eog-scroll-view.c b/src/eog-scroll-view.c
index e725d20..18a9324 100644
--- a/src/eog-scroll-view.c
+++ b/src/eog-scroll-view.c
@@ -1243,10 +1243,12 @@ void
 eog_scroll_view_set_image (EogScrollView *view, EogImage *image)
 {
        EogScrollViewPrivate *priv;
+       GtkImageView *display;
 
        g_return_if_fail (EOG_IS_SCROLL_VIEW (view));
 
        priv = view->priv;
+       display = GTK_IMAGE_VIEW (priv->display);
 
        if (priv->image == image) {
                return;
@@ -1262,10 +1264,15 @@ eog_scroll_view_set_image (EogScrollView *view, EogImage *image)
        }
 
        priv->image = image;
-       gtk_image_view_set_angle (GTK_IMAGE_VIEW (priv->display), 0);
-       gtk_image_view_set_fit_allocation (GTK_IMAGE_VIEW (priv->display), TRUE);
-       gtk_image_view_set_abstract_image (GTK_IMAGE_VIEW (priv->display),
+
+       /* Disable the transitions in any case here so we don't see a possible
+        * angle transition */
+       gtk_image_view_set_transitions_enabled (display, FALSE);
+       gtk_image_view_set_angle (display, 0);
+       gtk_image_view_set_fit_allocation (display, TRUE);
+       gtk_image_view_set_abstract_image (display,
                                           GTK_ABSTRACT_IMAGE (image));
+       gtk_image_view_set_transitions_enabled (display, TRUE);
 
 
        g_object_notify (G_OBJECT (view), "image");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]