Merge branch 'enlightenment-0.21' of git+ssh://git.enlightenment.org/core/enlightenment into enlightenment-0.21

This commit is contained in:
Simon Lees 2016-12-12 08:00:11 +10:30
commit caade0432a
3 changed files with 3 additions and 0 deletions

View File

@ -105,6 +105,7 @@ _fade_stop(Evas_Object *obj, Eina_Bool reset)
{
INF("stopped faded object %p", obj);
if (efd->anim) ecore_animator_del(efd->anim);
efd->anim = NULL;
if (e_efx_queue_complete(efd->e, efd))
e_efx_queue_process(efd->e);
}

View File

@ -123,6 +123,7 @@ _move_stop(Evas_Object *obj, Eina_Bool reset)
{
INF("stopped moved object %p", obj);
if (emd->anim) ecore_animator_del(emd->anim);
emd->anim = NULL;
if (e_efx_queue_complete(emd->e, emd))
e_efx_queue_process(emd->e);
}

View File

@ -108,6 +108,7 @@ _resize_stop(Evas_Object *obj, Eina_Bool reset)
{
INF("stopped resized object %p", obj);
if (erd->anim) ecore_animator_del(erd->anim);
erd->anim = NULL;
if (erd->moving)
{
erd->moving = 0;