From 7bed34f523cd26ef54aa6bb3bd5a1404ddf44f50 Mon Sep 17 00:00:00 2001 From: Aharon Hillel Date: Wed, 21 Dec 2011 08:47:50 +0000 Subject: [PATCH] Elm glayer: Updated rotation momentum computation - not final version Signed-off-by: Aharon Hillel SVN revision: 66422 --- legacy/elementary/src/lib/elm_gesture_layer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/legacy/elementary/src/lib/elm_gesture_layer.c b/legacy/elementary/src/lib/elm_gesture_layer.c index 44df48456d..f3215dcb9a 100644 --- a/legacy/elementary/src/lib/elm_gesture_layer.c +++ b/legacy/elementary/src/lib/elm_gesture_layer.c @@ -2779,10 +2779,11 @@ _get_rotate_properties(Rotate_Type *st, if (tm_total) { /* Momentum computed as: accumulated roation angle (rad) divided by time */ - double m; - if ((prev_angle >= RAD_270DEG) && ((*angle) < RAD_180DEG)) + double m = 0;; + if (((prev_angle < RAD_90DEG) && ((*angle) > RAD_270DEG)) || + ((prev_angle > RAD_270DEG) && ((*angle) < RAD_90DEG))) { /* We circle passing ZERO point */ - m = (RAD_360DEG - prev_angle) + (*angle); + prev_angle = (*angle); } else m = (*angle) - prev_angle; @@ -2796,9 +2797,9 @@ _get_rotate_properties(Rotate_Type *st, st->accum_momentum = 0.0; /* reset momentum */ st->prev_momentum = 0.0; /* Start again */ - st->prev_momentum_tm = tm_end; } + st->prev_momentum_tm = tm_end; st->info.momentum = (st->accum_momentum * 1000) / tm_total; } }