orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[scroller] fixed infinite loop bug in scroller 

Summary: called scroller bring in API in "scroll,anim,stop" callback, so occured infinite loop

Reviewers: seoz, jaehwan, raster, woohyun, cedric

Reviewed By: raster

Differential Revision: https://phab.enlightenment.org/D445
This commit is contained in:
Hosang Kim 2014-01-10 15:42:12 +09:00 committed by Carsten Haitzler (Rasterman)
parent ec4d51fdf5
commit 55d26bd52e
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
legacy/elementary/src/lib/elm_interface_scrollable.c
View File

@ -1757,24 +1757,25 @@ _elm_scroll_content_region_show_internal(Evas_Object *obj,
if ((sid->down.bounce_x_animator) || (sid->down.bounce_y_animator) ||
(sid->scrollto.x.animator) || (sid->scrollto.y.animator))
{
ELM_SAFE_FREE(sid->scrollto.x.animator, ecore_animator_del);
ELM_SAFE_FREE(sid->scrollto.y.animator, ecore_animator_del);
if (sid->down.bounce_x_animator)
{
ELM_SAFE_FREE(sid->down.bounce_x_animator, ecore_animator_del);
sid->bouncemex = EINA_FALSE;
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
if (sid->down.bounce_y_animator)
{
ELM_SAFE_FREE(sid->down.bounce_y_animator, ecore_animator_del);
sid->bouncemey = EINA_FALSE;
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
_elm_scroll_anim_stop(sid);
}
ELM_SAFE_FREE(sid->scrollto.x.animator, ecore_animator_del);
ELM_SAFE_FREE(sid->scrollto.y.animator, ecore_animator_del);
if (sid->down.bounce_x_animator)
{
ELM_SAFE_FREE(sid->down.bounce_x_animator, ecore_animator_del);
sid->bouncemex = EINA_FALSE;
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
if (sid->down.bounce_y_animator)
{
ELM_SAFE_FREE(sid->down.bounce_y_animator, ecore_animator_del);
sid->bouncemey = EINA_FALSE;
if (sid->content_info.resized)
_elm_scroll_wanted_region_set(sid->obj);
}
if (sid->down.hold_animator)
{
ELM_SAFE_FREE(sid->down.hold_animator, ecore_animator_del);