From 0c903156ef5b043149ad4368b9b7606d985ed4bb Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Tue, 24 Feb 2015 14:52:40 +0100 Subject: [PATCH] scrolledwindow: Only start fade animation on "visible" scrollbars If a scrollbar is not shown (because of policies, or because it isn't necessary), it doesn't make sense to start fade animations on its window on captured motion events. --- gtk/gtkscrolledwindow.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index b3f3770e05..dbc0f159da 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -1087,8 +1087,10 @@ captured_event_cb (GtkWidget *widget, if (event->type == GDK_MOTION_NOTIFY) { - indicator_start_fade (&priv->hindicator, 1.0); - indicator_start_fade (&priv->vindicator, 1.0); + if (priv->hscrollbar_visible) + indicator_start_fade (&priv->hindicator, 1.0); + if (priv->vscrollbar_visible) + indicator_start_fade (&priv->vindicator, 1.0); if ((event->motion.state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) != 0)