Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/exalm/kinetic_scrolling_gtk3' into 'gtk-3-24'

Browse Source 
eventcontrollerscroll: Fix the history push condition

See merge request GNOME/gtk!1903
This commit is contained in:
Matthias Clasen
2020-05-14 22:41:13 +00:00
parent 0efc217dda 97f540622a
commit a94753429c
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkeventcontrollerscroll.c
View File

@@ -326,12 +326,11 @@ gtk_event_controller_scroll_handle_event (GtkEventController *controller,
}
if (dx != 0 || dy != 0)
{
g_signal_emit (controller, signals[SCROLL], 0, dx, dy);
g_signal_emit (controller, signals[SCROLL], 0, dx, dy);
if (scroll->flags & GTK_EVENT_CONTROLLER_SCROLL_KINETIC)
scroll_history_push (scroll, dx, dy, gdk_event_get_time (event));
}
if (direction == GDK_SCROLL_SMOOTH &&
scroll->flags & GTK_EVENT_CONTROLLER_SCROLL_KINETIC)
scroll_history_push (scroll, dx, dy, gdk_event_get_time (event));
if (scroll->active && gdk_event_is_scroll_stop_event (event))
{