aboutsummaryrefslogtreecommitdiff
path: root/src/evdev.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2014-04-29 09:50:21 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2014-04-29 09:52:31 +1000
commit75368052b57aa07252e26642315bcf9a0b2e78eb (patch)
tree6a0130430a7c416c00e9d49b482478d9292b6d5a /src/evdev.c
parentMap REL_DIAL to horizontal scrolling (#73105) (diff)
downloadxf86-input-evdev-75368052b57aa07252e26642315bcf9a0b2e78eb.tar.gz
xf86-input-evdev-75368052b57aa07252e26642315bcf9a0b2e78eb.tar.bz2
xf86-input-evdev-75368052b57aa07252e26642315bcf9a0b2e78eb.zip
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.
Diffstat (limited to 'src/evdev.c')
-rw-r--r--src/evdev.c4
1 files 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);
}