diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-12-21 18:22:53 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-12-21 18:22:53 +0000 |
commit | 248bb148afe7b6d81b766b1054258153703b8156 (patch) | |
tree | 00b908726de99254363fa730151c8f113db2fb4b | |
parent | 855357f871fa89d710f6d3fcb5a028bf76a5be31 (diff) | |
parent | 552267b93d2e02773edd2865846a79f70759d03b (diff) | |
download | gtk+-248bb148afe7b6d81b766b1054258153703b8156.tar.gz |
Merge branch 'discrete-scroll' into 'main'
Don't keep discrete scroll events in the queue
See merge request GNOME/gtk!4274
-rw-r--r-- | gdk/gdkevents.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index d0680e3696..e577c6b9c0 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -522,7 +522,8 @@ _gdk_event_queue_find_first (GdkDisplay *display) if (pending_motion) return pending_motion; - if ((event->event_type == GDK_MOTION_NOTIFY || event->event_type == GDK_SCROLL) && + if ((event->event_type == GDK_MOTION_NOTIFY || + (event->event_type == GDK_SCROLL && gdk_scroll_event_get_direction (event) == GDK_SCROLL_SMOOTH)) && (event->flags & GDK_EVENT_FLUSHED) == 0) pending_motion = tmp_list; else |