summaryrefslogtreecommitdiff
path: root/gtk/gtkeventcontrollerscroll.c
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2020-09-28 23:30:05 +0200
committerCarlos Garnacho <carlosg@gnome.org>2020-09-28 23:35:36 +0200
commit11e4a4696713bc70084e11f8ee3a1a127b03e01a (patch)
treef9723c6f36d128af6daf0c217e4a4d84f6ae5585 /gtk/gtkeventcontrollerscroll.c
parent01ddc181f90c8d7c24404765c1547289c9aa628b (diff)
downloadgtk+-11e4a4696713bc70084e11f8ee3a1a127b03e01a.tar.gz
gtkeventcontrollerscroll: Drop device type checks
Kinetic scrolling (and begin/end tracking) broke with commit cab1dcb696 since the pointing device used on X11 does not get as much GdkInputSource granularity as the source device used to have in GTK3. Actually this is kinda pointless, devices incapable of smooth scroll should send discrete events, without those devices in the picture, we want kinetic scroll to apply on every other device capable of smooth scroll, so just do that. Fixes: https://gitlab.gnome.org/GNOME/gtk/-/issues/3210
Diffstat (limited to 'gtk/gtkeventcontrollerscroll.c')
-rw-r--r--gtk/gtkeventcontrollerscroll.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/gtk/gtkeventcontrollerscroll.c b/gtk/gtkeventcontrollerscroll.c
index 46573ca7de..8b67f4ca91 100644
--- a/gtk/gtkeventcontrollerscroll.c
+++ b/gtk/gtkeventcontrollerscroll.c
@@ -263,9 +263,7 @@ gtk_event_controller_scroll_handle_event (GtkEventController *controller,
gdk_scroll_event_get_deltas (event, &dx, &dy);
- if (!scroll->active &&
- (input_source == GDK_SOURCE_TRACKPOINT ||
- input_source == GDK_SOURCE_TOUCHPAD))
+ if (!scroll->active)
{
g_signal_emit (controller, signals[SCROLL_BEGIN], 0);
scroll_history_reset (scroll);