callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scrolledwindow: Cancel kinetic/overshoot animation on captured scroll events

Browse Source 
This ensures the animation is cancelled if the child widget happens to
GDK_EVENT_STOP scroll events.

https://bugzilla.gnome.org/show_bug.cgi?id=745315
This commit is contained in:
Carlos Garnacho
2015-03-02 17:01:21 +01:00
parent 15411aa032
commit e1694a719f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkscrolledwindow.c
View File

@ -1222,6 +1222,12 @@ captured_event_cb (GtkWidget *widget,
priv = sw->priv; priv = sw->priv;
source_device = gdk_event_get_source_device (event); source_device = gdk_event_get_source_device (event);
if (event->type == GDK_SCROLL)
{
gtk_scrolled_window_cancel_deceleration (sw);
return GDK_EVENT_PROPAGATE;
}
if (!priv->use_indicators) if (!priv->use_indicators)
return GDK_EVENT_PROPAGATE; return GDK_EVENT_PROPAGATE;
@ -3183,7 +3189,6 @@ gtk_scrolled_window_scroll_event (GtkWidget *widget,
{ {
gdouble vel_x, vel_y; gdouble vel_x, vel_y;
gtk_scrolled_window_cancel_deceleration (scrolled_window);
gtk_scrolled_window_invalidate_overshoot (scrolled_window); gtk_scrolled_window_invalidate_overshoot (scrolled_window);
if (priv->scroll_events_overshoot_id) if (priv->scroll_events_overshoot_id)