From 9e506fc581b1ef4d0f02d05f44fe687a5b0ca50f Mon Sep 17 00:00:00 2001 From: Jae Hwan Kim Date: Thu, 24 Mar 2011 07:34:23 +0000 Subject: [PATCH] From: Jae Hwan Kim If the scroller is stopped and set the freeze push while bounce animation is running, it will stop bouncing in a moment. Even if the scroller is set the freeze pop again, the scroller don't finish the bouncing. I think that it should finish the bouncing when it is set the freeze pop. SVN revision: 58063 --- legacy/elementary/src/lib/els_scroller.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/legacy/elementary/src/lib/els_scroller.c b/legacy/elementary/src/lib/els_scroller.c index 3b6ab717e8..5d53cd864f 100644 --- a/legacy/elementary/src/lib/els_scroller.c +++ b/legacy/elementary/src/lib/els_scroller.c @@ -1233,6 +1233,8 @@ elm_smart_scroller_freeze_set(Evas_Object *obj, Eina_Bool freeze) sd->down.onhold_animator = NULL; } } + else + bounce_eval(sd); } void @@ -1759,8 +1761,7 @@ _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *ev { vel = sqrt((dx * dx) + (dy * dy)) / at; if ((_elm_config->thumbscroll_friction > 0.0) && - (vel > _elm_config->thumbscroll_momentum_threshold) && - (!sd->freeze)) + (vel > _elm_config->thumbscroll_momentum_threshold)) { sd->down.dx = ((double)dx / at); sd->down.dy = ((double)dy / at);