mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2026-01-01 17:40:11 +01:00
Merge branch 'pointer-warp' into 'master'
xwayland: Allow pointer warps even when cursor is visible. See merge request xorg/xserver!1839
This commit is contained in:
commit
e2e31c3547
1 changed files with 3 additions and 3 deletions
|
|
@ -3515,9 +3515,6 @@ xwl_seat_emulate_pointer_warp(struct xwl_seat *xwl_seat,
|
|||
if (!xwl_seat_can_emulate_pointer_warp(xwl_seat))
|
||||
return;
|
||||
|
||||
if (xwl_seat->x_cursor != NULL)
|
||||
return;
|
||||
|
||||
if (!xwl_seat->pointer_warp_emulator)
|
||||
xwl_seat_create_pointer_warp_emulator(xwl_seat);
|
||||
|
||||
|
|
@ -3528,6 +3525,9 @@ xwl_seat_emulate_pointer_warp(struct xwl_seat *xwl_seat,
|
|||
xwl_window,
|
||||
sprite,
|
||||
x, y);
|
||||
|
||||
if (xwl_seat->x_cursor != NULL)
|
||||
xwl_seat_destroy_pointer_warp_emulator(xwl_seat);
|
||||
}
|
||||
|
||||
static Bool
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue