From 1681e90809ae248299bc5be5a9af12e871544a7d Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Sat, 7 Aug 2010 16:47:25 +0200 Subject: treat one-finger moves in move model and simplify tapping logic --- src/grail-gestures.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/grail-gestures.c') diff --git a/src/grail-gestures.c b/src/grail-gestures.c index cb7e5a3..0c0efdb 100644 --- a/src/grail-gestures.c +++ b/src/grail-gestures.c @@ -144,13 +144,23 @@ void gru_motion(struct grail *ge, struct move_model *state = &gru->move; float x, y, r, a; compute_position(&x, &y, frame); - if (frame->nactive < 2 || frame->ncreate || frame->ndestroy) { + if (frame->ncreate || frame->ndestroy) { r = compute_radius(x, y, frame); a = 0; move_reset(&state->x, x); move_reset(&state->y, y); move_reset(&state->r, r); move_reset(&state->a, a); + state->single = 0; + state->multi = 0; + } else if (frame->nactive < 2) { + r = 0; + a = 0; + move_update(&state->x, x); + move_update(&state->y, y); + move_reset(&state->r, r); + move_reset(&state->a, a); + state->single = 1; state->multi = 0; } else { x = move_filter(&state->x, x); @@ -163,6 +173,7 @@ void gru_motion(struct grail *ge, move_update(&state->y, y); move_update(&state->r, r); move_update(&state->a, a); + state->single = 0; state->multi = 1; } state->ntouch = frame->nactive; -- cgit v1.2.3