Merge remote-tracking branch 'whot/for-keith'

This commit is contained in:
Keith Packard 2012-08-06 16:52:12 -07:00
commit 02f94b2d44
3 changed files with 43 additions and 8 deletions

View file

@ -1625,6 +1625,8 @@ GetPointerEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
if (adj != 0.0 && axis != -1) {
adj *= pDev->valuator->axes[axis].scroll.increment;
if (!valuator_mask_isset(&mask, axis))
valuator_mask_set(&mask, axis, 0);
add_to_scroll_valuator(pDev, &mask, axis, adj);
type = MotionNotify;
buttons = 0;