From: Jae Hwan Kim <jae.hwan.kim@samsung.com>

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
This commit is contained in:
Jae Hwan Kim 2011-03-24 07:34:23 +00:00 committed by Carsten Haitzler
parent a6a182f7b6
commit 9e506fc581
1 changed files with 3 additions and 2 deletions

View File

@ -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);