From ec0901e5f81d9cad6cc8bbdcb5ea075009c13de5 Mon Sep 17 00:00:00 2001 From: Gabriele Mazzotta Date: Thu, 14 Aug 2014 20:03:42 +0200 Subject: Use cumulative relative touch movements while scrolling Signed-off-by: Gabriele Mazzotta Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- src/synaptics.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/synaptics.c') diff --git a/src/synaptics.c b/src/synaptics.c index b49957c..e8a08d2 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -3098,9 +3098,11 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now, } } - /* If a physical button is pressed on a clickpad, use cumulative relative - * touch movements for motion */ - if (para->clickpad && (priv->lastButtons & 7) && + /* If a physical button is pressed on a clickpad or a two-finger scrolling + * is ongoing, use cumulative relative touch movements for motion */ + if (para->clickpad && + ((priv->lastButtons & 7) || + (priv->vert_scroll_twofinger_on || priv->horiz_scroll_twofinger_on)) && priv->last_button_area != TOP_BUTTON_AREA) { hw->x = hw->cumulative_dx; hw->y = hw->cumulative_dy; -- cgit v1.2.3