From 75368052b57aa07252e26642315bcf9a0b2e78eb Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 29 Apr 2014 09:50:21 +1000 Subject: Revert "Map REL_DIAL to horizontal scrolling (#73105)" Whoops, the vertical axis is swapped, so when changing the axis we also need to change the direction. This reverts commit 16c85cbeacb721ed365c6240aabaad921b811fe0. --- src/evdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index 6d02bdd..ed84f0f 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1574,7 +1574,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device, int want_scroll_axes) NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0, Relative); SetScrollValuator(device, pEvdev->rel_axis_map[idx], - SCROLL_TYPE_HORIZONTAL, + SCROLL_TYPE_VERTICAL, -pEvdev->smoothScroll.dial_delta, SCROLL_FLAG_NONE); } @@ -1652,7 +1652,7 @@ EvdevSetScrollValuators(DeviceIntPtr device) axnum = pEvdev->rel_axis_map[REL_DIAL]; if (axnum != -1) { - SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, + SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -pEvdev->smoothScroll.dial_delta, SCROLL_FLAG_NONE); } -- cgit v1.2.3