Merge branch 'wip/carlosg/for-master' into 'master'

gtkeventcontrollerscroll: Drop device type checks

Closes #3210

See merge request GNOME/gtk!2635
This commit is contained in:
Matthias Clasen 2020-09-28 22:03:36 +00:00
commit 5536a2ffe6

View File

@ -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);