diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-09-28 22:03:36 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-09-28 22:03:36 +0000 |
| commit | 5536a2ffe69263c83f6770bc9cb39f2a31911928 (patch) | |
| tree | f9723c6f36d128af6daf0c217e4a4d84f6ae5585 | |
| parent | 01ddc181f90c8d7c24404765c1547289c9aa628b (diff) | |
| parent | 11e4a4696713bc70084e11f8ee3a1a127b03e01a (diff) | |
| download | gtk+-5536a2ffe69263c83f6770bc9cb39f2a31911928.tar.gz | |
Merge branch 'wip/carlosg/for-master' into 'master'
gtkeventcontrollerscroll: Drop device type checks
Closes #3210
See merge request GNOME/gtk!2635
| -rw-r--r-- | gtk/gtkeventcontrollerscroll.c | 4 |
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); |