From: Hans de Goede Date: Tue, 24 Jun 2014 14:23:11 +0000 (+0200) Subject: tp_post_twofinger_scroll: Move setting of t->is_pointer = false up a bit X-Git-Tag: 0.4.0~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d6356e668ef34f634ce99df9fca20abf2446be8;p=platform%2Fupstream%2Flibinput.git tp_post_twofinger_scroll: Move setting of t->is_pointer = false up a bit There is no need to loop over the touch points twice. Signed-off-by: Hans de Goede Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index 04ea93c6..ced92378 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -453,6 +453,8 @@ tp_post_twofinger_scroll(struct tp_dispatch *tp, uint64_t time) dx += tmpx; dy += tmpy; } + /* Stop spurious MOTION events at the end of scrolling */ + t->is_pointer = false; } if (nchanged == 0) @@ -470,10 +472,6 @@ tp_post_twofinger_scroll(struct tp_dispatch *tp, uint64_t time) if (dx <= -3.0 || dx >= 3.0) tp->scroll.direction |= (1 << LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL); - /* Stop spurious MOTION events at the end of scrolling */ - tp_for_each_touch(tp, t) - t->is_pointer = false; - if (dy != 0.0 && (tp->scroll.direction & (1 << LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))) { pointer_notify_axis(&tp->device->base,