Merge branch 'wip/carlosg/touchpad-gesture-devices' into 'master'

gdk/wayland: Assign logical pointer to touchpad gesture events

See merge request GNOME/gtk!3240
This commit is contained in:
Matthias Clasen
2021-02-25 12:23:26 +00:00

View File

@@ -2536,7 +2536,7 @@ emit_gesture_swipe_event (GdkWaylandSeat *seat,
seat->pointer_info.time = _time;
event = gdk_touchpad_event_new_swipe (seat->pointer_info.focus,
seat->pointer,
seat->logical_pointer,
_time,
device_get_modifiers (seat->logical_pointer),
phase,
@@ -2632,7 +2632,7 @@ emit_gesture_pinch_event (GdkWaylandSeat *seat,
seat->pointer_info.time = _time;
event = gdk_touchpad_event_new_pinch (seat->pointer_info.focus,
seat->pointer,
seat->logical_pointer,
_time,
device_get_modifiers (seat->logical_pointer),
phase,