fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-01-08 00:00:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gestures: move first_moved and first_mm up

Browse source 
Move the calculation of first_moved and first_mm up inside
tp_gesture_detect_motion_gestures in order to be able to use their
values in the one finger code path.

Signed-off-by: José Expósito <jose.exposito89@gmail.com>
This commit is contained in:
José Expósito 2021-05-31 17:58:11 +02:00 • committed by Peter Hutterer
parent 13c47598bc
commit 45e6e28ca2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/evdev-mt-touchpad-gestures.c
View file

@ -811,6 +811,9 @@ tp_gesture_detect_motion_gestures(struct tp_dispatch *tp, uint64_t time)
double min_move = 1.5; /* min movement threshold in mm - count this touch */
double max_move = 4.0; /* max movement threshold in mm - ignore other touch */
first_moved = tp_gesture_mm_moved(tp, first);
first_mm = hypot(first_moved.x, first_moved.y);
if (tp->gesture.finger_count == 1) {
if (tp_has_pending_pointer_motion(tp, time)) {
tp_gesture_handle_event(tp,
@ -832,9 +835,6 @@ tp_gesture_detect_motion_gestures(struct tp_dispatch *tp, uint64_t time)
max_move += 2.0 * (tp->gesture.finger_count - 2);
min_move += 0.5 * (tp->gesture.finger_count - 2);
first_moved = tp_gesture_mm_moved(tp, first);
first_mm = hypot(first_moved.x, first_moved.y);
second_moved = tp_gesture_mm_moved(tp, second);
second_mm = hypot(second_moved.x, second_moved.y);