mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-10 23:33:46 +00:00
Merge remote-tracking branch 'whot/for-keith'
This commit is contained in:
commit
02f94b2d44
3 changed files with 43 additions and 8 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue