diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-03-14 13:24:32 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-03-20 10:58:28 +1000 |
| commit | 5cde789fcafaed47c2533c4315e5c7d5548605f5 (patch) | |
| tree | aef95f3e7eb811aba5ef924ae1e8c240ca4aa310 | |
| parent | dd650a064b98b1c325a38e1370cc11059c257b07 (diff) | |
Fix inverted circular scrolling direction
Introduced in 26831a6eeac6762ad4d99532f62ebbab0827de10.
In said commit, the old-style button events were changed to delta
accumulation. Alas, for circular scrolling, a positive delta is up whereas
for everything else a positive delta is down.
Reported-by: Thomas Bächler <thomas@archlinux.org>
Tested-by: Thomas Bächler <thomas@archlinux.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
| -rw-r--r-- | src/synaptics.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/synaptics.c b/src/synaptics.c index 898130e..489eeaa 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -2552,9 +2552,9 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw, double diff = diffa(priv->scroll.last_a, angle(priv, hw->x, hw->y)); if (delta >= 0.005 && diff != 0.0) { if (priv->circ_scroll_vert) - priv->scroll.delta_y += diff / delta * para->scroll_dist_vert; + priv->scroll.delta_y -= diff / delta * para->scroll_dist_vert; else - priv->scroll.delta_x += diff / delta * para->scroll_dist_horiz;; + priv->scroll.delta_x -= diff / delta * para->scroll_dist_horiz; priv->scroll.last_a = angle(priv, hw->x, hw->y); } } |