Commit f8bcbc2d authored by Peter Hutterer's avatar Peter Hutterer

gestures: average motion by active touches, not moved touches

When two fingers move slowly, an event frame may only have one finger motion,
followed by a frame with the other finger's motion. If we only divide by the
number of dirty touches, the speed of the gesture increases whenever that
happens.
Reported-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 6ad303b3
......@@ -49,15 +49,19 @@ static struct normalized_coords
tp_get_touches_delta(struct tp_dispatch *tp, bool average)
{
struct tp_touch *t;
unsigned int i, nchanged = 0;
unsigned int i, nactive = 0;
struct normalized_coords normalized;
struct normalized_coords delta = {0.0, 0.0};
for (i = 0; i < tp->num_slots; i++) {
t = &tp->touches[i];
if (tp_touch_active(tp, t) && t->dirty) {
nchanged++;
if (!tp_touch_active(tp, t))
continue;
nactive++;
if (t->dirty) {
normalized = tp_get_delta(t);
delta.x += normalized.x;
......@@ -65,11 +69,11 @@ tp_get_touches_delta(struct tp_dispatch *tp, bool average)
}
}
if (!average || nchanged == 0)
if (!average || nactive == 0)
return delta;
delta.x /= nchanged;
delta.y /= nchanged;
delta.x /= nactive;
delta.y /= nactive;
return delta;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment