frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland: Add break statements in pointer_handle_axis 

Fixes accidentally taking the WL_POINTER_AXIS_HORIZONTAL_SCROLL case as
well after the WL_POINTER_AXIS_VERTICAL_SCROLL case, which resulted in
vertical wheel events triggering both vertical and horizontal scrolling.

Fixes: e37eeb7af2 ("xwayland: Aggregate scroll axis events to fix kinetic scrolling")
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1367
This commit is contained in:
Michel Dänzer 2022-08-17 18:24:38 +02:00 committed by Michel Dänzer
parent 2700bc6045
commit f0b2eeaf2f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xwayland/xwayland-input.c
View File

@ -782,9 +782,11 @@ pointer_handle_axis(void *data, struct wl_pointer *pointer,
case WL_POINTER_AXIS_VERTICAL_SCROLL: case WL_POINTER_AXIS_VERTICAL_SCROLL:
xwl_seat->pending_pointer_event.has_vertical_scroll = TRUE; xwl_seat->pending_pointer_event.has_vertical_scroll = TRUE;
xwl_seat->pending_pointer_event.scroll_dy = value; xwl_seat->pending_pointer_event.scroll_dy = value;
break;
case WL_POINTER_AXIS_HORIZONTAL_SCROLL: case WL_POINTER_AXIS_HORIZONTAL_SCROLL:
xwl_seat->pending_pointer_event.has_horizontal_scroll = TRUE; xwl_seat->pending_pointer_event.has_horizontal_scroll = TRUE;
xwl_seat->pending_pointer_event.scroll_dx = value; xwl_seat->pending_pointer_event.scroll_dx = value;
break;
} }
} }