From a70ef98d57d3467c43cdd95ce944d0b31c35c907 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 8 Apr 2014 08:39:11 +0200 Subject: [PATCH] touchpad: Remove clickpad clicked test from 2 finger scrolling handling This is no longer needed now that we take the button area and pinned fingers into account. Signed-off-by: Hans de Goede Reviewed-by: Peter Hutterer --- src/evdev-mt-touchpad.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c index c61d8730..e2c865e5 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c @@ -502,11 +502,6 @@ tp_post_scroll_events(struct tp_dispatch *tp, uint32_t time) struct tp_touch *t; int nfingers_down = 0; - /* don't scroll if a clickpad is held down */ - if (tp->buttons.is_clickpad && - (tp->buttons.state || tp->buttons.old_state)) - return 0; - /* Only count active touches for 2 finger scrolling */ tp_for_each_touch(tp, t) { if (tp_touch_active(tp, t))