efl_animation: Fix to set Efl_Event_Description for event animation

Any event represented by Efl_Event_Description can be registered for
event animation. (e.g. EFL_GFX_EVENT_SHOW, EFL_GFX_EVENT_HIDE, etc.)

src/bin/elementary/test_efl_anim_event_anim.c

@@ -61,7 +61,7 @@ test_efl_anim_event_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
    efl_animation_alpha_set(show_anim, 0.0, 1.0);
    efl_animation_duration_set(show_anim, 1.0);
    efl_animation_target_set(show_anim, btn);
-   efl_canvas_object_event_animation_set(btn, EFL_ANIMATION_EVENT_TYPE_SHOW, show_anim);
+   efl_canvas_object_event_animation_set(btn, EFL_GFX_EVENT_SHOW, show_anim);
 
    //Show button after setting event animation to show animation for show event
    evas_object_show(btn);
@@ -71,7 +71,7 @@ test_efl_anim_event_anim(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
    efl_animation_alpha_set(hide_anim, 1.0, 0.0);
    efl_animation_duration_set(hide_anim, 1.0);
    efl_animation_target_set(hide_anim, btn);
-   efl_canvas_object_event_animation_set(btn, EFL_ANIMATION_EVENT_TYPE_HIDE, hide_anim);
+   efl_canvas_object_event_animation_set(btn, EFL_GFX_EVENT_HIDE, hide_anim);
 
    //Initialize App Data
    ad->target = btn;

src/lib/evas/canvas/efl_animation_types.eot

@@ -3,15 +3,6 @@
 
 struct Efl.Animation.Object.Running_Event_Info; [[Information of running event]]
 
-enum Efl.Animation.Event_Type
-{
-   [[Animation event type]]
-
-   show = 0,   [["show" event type]]
-   hide = 1,   [["hide" event type]]
-   clicked = 2 [["clicked" event type]]
-}
-
 enum Efl.Animation.Repeat_Mode
 {
    [[Animation repeat mode]]

src/lib/evas/canvas/efl_canvas_object.eo

@@ -660,7 +660,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
       event_animation_set {
          [[Set the $animation which starts when the given $event_name happens to the object.]]
          params {
-            @in event_type: Efl.Animation.Event_Type; [[The event type the given $animation is set for.]]
+            @in event_type: ptr(const(Efl.Event.Description)); [[The event description for which the given $animation is set.]]
             @in animation: Efl.Object /* FIXME: Efl.Animation */;
                [[The animation which starts when the given $event_name happens to the object.]]
          }
@@ -669,7 +669,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
       event_animation_get {
          [[Get the $animation which starts when the given $event happens to the object.]]
          params {
-            @in event_type: Efl.Animation.Event_Type; [[The event type the given $animation is set for.]]
+            @in event_type: ptr(const(Efl.Event.Description)); [[The event description for which the given $animation is set.]]
          }
          legacy: null;
          return: Efl.Object /* FIXME: Efl.Animation */ @warn_unused;

src/lib/evas/canvas/evas_object_intercept.c

@@ -108,7 +108,7 @@ _evas_object_intercept_call_internal(Evas_Object *eo_obj,
               * proceeded. */
              if (i &&
                  _efl_canvas_object_event_animation_is_running(eo_obj,
-                                                               EFL_ANIMATION_EVENT_TYPE_HIDE))
+                                                               EFL_GFX_EVENT_HIDE))
                _efl_canvas_object_event_animation_cancel(eo_obj);
              else
                return 1;

src/lib/evas/canvas/evas_object_main.c

@@ -48,16 +48,16 @@ Eina_Cow *evas_object_events_cow = NULL;
 
 typedef struct _Event_Animation
 {
+   EINA_INLIST;
+
+   const Efl_Event_Description *desc;
+
    Efl_Animation               *anim;
    Efl_Animation_Object        *anim_obj;
-} Event_Animation;
 
-typedef struct _Hide_Anim_Data
+   Eina_Bool                    hide_anim_started : 1;
-{
+   Eina_Bool                    hide_anim_ended   : 1;
-   Efl_Canvas_Object *target;
+} Event_Animation;
-   Eina_Bool          anim_started;
-   Eina_Bool          anim_ended;
-} Hide_Anim_Data;
 
 static Eina_Bool
 _init_cow(void)
@@ -177,31 +177,82 @@ _evas_object_pointer_data_get(Evas_Pointer_Data *evas_pdata,
    return pdata;
 }
 
-static void
+static void _animation_intercept_hide(void *data, Evas_Object *eo_obj);
-_init_event_anims(Evas_Object_Protected_Data *obj)
-{
-   obj->event_anims = eina_array_new(EFL_ANIMATION_EVENT_TYPE_COUNT);
 
-   int i;
+static void
-   for (i = 0; i < EFL_ANIMATION_EVENT_TYPE_COUNT; i++)
+_animation_hide_end_cb(void *data, const Efl_Event *event EINA_UNUSED)
+{
+   Event_Animation *event_anim = data;
+
+   event_anim->hide_anim_ended = EINA_TRUE;
+
+   //Animation Object is automatically deleted when animation is ended.
+   event_anim->anim_obj = NULL;
+
+   Evas_Object *target = efl_animation_target_get(event_anim->anim);
+   _animation_intercept_hide(event_anim, target);
+
+   event_anim->hide_anim_started = EINA_FALSE;
+   event_anim->hide_anim_ended = EINA_FALSE;
+}
+
+static void _all_animation_objects_cancel(Evas_Object_Protected_Data *obj);
+
+static void
+_animation_intercept_hide(void *data, Evas_Object *eo_obj)
+{
+   Event_Animation *event_anim = data;
+   Evas_Object_Protected_Data *obj = EVAS_OBJECT_DATA_SAFE_GET(eo_obj);
+
+   if (event_anim->anim &&
+       !event_anim->hide_anim_started && !event_anim->hide_anim_ended)
      {
-        Event_Animation *event_anims = calloc(1, sizeof(Event_Animation));
+        event_anim->hide_anim_started = EINA_TRUE;
-        eina_array_push(obj->event_anims, event_anims);
+
+        _all_animation_objects_cancel(obj);
+
+        //Create animation object to start animation
+        event_anim->anim_obj = efl_animation_object_create(event_anim->anim);
+
+        efl_event_callback_add(event_anim->anim_obj,
+                               EFL_ANIMATION_OBJECT_EVENT_ENDED,
+                               _animation_hide_end_cb,
+                               event_anim);
+
+        //Start animation
+        efl_animation_object_start(event_anim->anim_obj);
      }
+   else
+     efl_gfx_visible_set(eo_obj, EINA_FALSE);
 }
 
 static void
-_free_event_anims(Evas_Object_Protected_Data *obj)
+_event_anim_free(Event_Animation *event_anim)
 {
-   int i;
+   if (event_anim->anim)
-   for (i = 0; i < EFL_ANIMATION_EVENT_TYPE_COUNT; i++)
      {
-        Event_Animation *event_anims = eina_array_pop(obj->event_anims);
+        //Deallocate memory and Unset callbacks for Hide event
-        if (event_anims) free(event_anims);
+        if (event_anim->desc == EFL_GFX_EVENT_HIDE)
+          {
+             Efl_Canvas_Object *target =
+                efl_animation_target_get(event_anim->anim);
+
+             evas_object_intercept_hide_callback_del(target,
+                                                     _animation_intercept_hide);
+
+             if (event_anim->hide_anim_started &&
+                 !event_anim->hide_anim_ended)
+               efl_gfx_visible_set(target, EINA_FALSE);
+          }
      }
 
-   eina_array_free(obj->event_anims);
+   if (event_anim->anim_obj)
-   obj->event_anims = NULL;
+     {
+        efl_del(event_anim->anim_obj);
+        event_anim->anim_obj = NULL;
+     }
+
+   free(event_anim);
 }
 
 EOLIAN static Eo *
@@ -232,7 +283,7 @@ _efl_canvas_object_efl_object_constructor(Eo *eo_obj, Evas_Object_Protected_Data
    obj->data_3d = eina_cow_alloc(evas_object_3d_cow);
    obj->mask = eina_cow_alloc(evas_object_mask_cow);
    obj->events = eina_cow_alloc(evas_object_events_cow);
-   _init_event_anims(obj);
+   obj->event_anims = NULL;
 
    evas_object_inject(eo_obj, obj, evas);
    evas_object_callback_init(eo_obj, obj);
@@ -543,7 +594,19 @@ evas_object_free(Evas_Object *eo_obj, Eina_Bool clean_layer)
    eina_cow_free(evas_object_3d_cow, (const Eina_Cow_Data**) &obj->data_3d);
    eina_cow_free(evas_object_mask_cow, (const Eina_Cow_Data**) &obj->mask);
    eina_cow_free(evas_object_events_cow, (const Eina_Cow_Data**) &obj->events);
-   _free_event_anims(obj);
+
+   //Free event animations
+   while (obj->event_anims)
+     {
+        Event_Animation *event_anim =
+           EINA_INLIST_CONTAINER_GET(obj->event_anims, Event_Animation);
+
+        obj->event_anims =
+           eina_inlist_remove(obj->event_anims, obj->event_anims);
+
+        _event_anim_free(event_anim);
+     }
+
    efl_data_unref(eo_obj, obj->private_data);
    obj->private_data = NULL;
 
@@ -1071,60 +1134,34 @@ _is_event_blocked(Eo *eo_obj, const Efl_Event_Description *desc,
 }
 
 static Eina_Bool
-_efl_animation_event_type_is_inform_call(Efl_Animation_Event_Type event)
+_efl_animation_event_type_is_inform_call(const Efl_Event_Description *desc)
 {
-   if ((event == EFL_ANIMATION_EVENT_TYPE_SHOW) ||
+   if ((desc == EFL_GFX_EVENT_SHOW) || (desc == EFL_GFX_EVENT_HIDE) ||
-       (event == EFL_ANIMATION_EVENT_TYPE_HIDE))
+       (desc == EFL_GFX_EVENT_MOVE) || (desc == EFL_GFX_EVENT_RESIZE) ||
+       (desc == EFL_GFX_EVENT_CHANGE_SIZE_HINTS))
      return EINA_TRUE;
 
    return EINA_FALSE;
 }
 
-//These macros are matched to Efl_Animation_Event_Type enum values.
+static Event_Animation *
-#define EFL_ANIMATION_EVENT_TYPE_SHOW_STR    "show"
+_event_animation_find(Evas_Object_Protected_Data *obj,
-#define EFL_ANIMATION_EVENT_TYPE_HIDE_STR    "hide"
+                      const Efl_Event_Description *desc)
-#define EFL_ANIMATION_EVENT_TYPE_CLICKED_STR "clicked"
-
-static Efl_Animation_Event_Type
-_efl_animation_event_type_get(const char *event_str)
 {
-   if (!event_str) return -1;
+   Event_Animation *event_anim;
-
+   EINA_INLIST_FOREACH(obj->event_anims, event_anim)
-   if (!strncmp(event_str, EFL_ANIMATION_EVENT_TYPE_SHOW_STR,
+     {
-                strlen(EFL_ANIMATION_EVENT_TYPE_SHOW_STR)))
+        if (event_anim->desc == desc)
-     return EFL_ANIMATION_EVENT_TYPE_SHOW;
+          return event_anim;
-
+     }
-   else if (!strncmp(event_str, EFL_ANIMATION_EVENT_TYPE_HIDE_STR,
+   return NULL;
-                     strlen(EFL_ANIMATION_EVENT_TYPE_HIDE_STR)))
-     return EFL_ANIMATION_EVENT_TYPE_HIDE;
-
-   else if (!strncmp(event_str, EFL_ANIMATION_EVENT_TYPE_CLICKED_STR,
-                     strlen(EFL_ANIMATION_EVENT_TYPE_CLICKED_STR)))
-     return EFL_ANIMATION_EVENT_TYPE_CLICKED;
-
-   return -1;
-}
-
-static Eina_Bool
-_efl_animation_event_type_is_valid(Efl_Animation_Event_Type event)
-{
-   if ((event < 0) || (event >= EFL_ANIMATION_EVENT_TYPE_COUNT))
-     return EINA_FALSE;
-
-   return EINA_TRUE;
 }
 
 static Efl_Animation_Object *
-_event_animation_object_get(Eo *eo_obj, Efl_Animation_Event_Type event_type)
+_event_animation_object_get(Evas_Object_Protected_Data *obj,
+                            const Efl_Event_Description *desc)
 {
-   Evas_Object_Protected_Data *pd = efl_data_scope_get(eo_obj, MY_CLASS);
+   Event_Animation *event_anim = _event_animation_find(obj, desc);
-   if (!pd) return NULL;
-
-   if (!_efl_animation_event_type_is_valid(event_type))
-     return NULL;
-
-   Event_Animation *event_anim = eina_array_data_get(pd->event_anims,
-                                                     event_type);
    if (event_anim && event_anim->anim_obj)
      return event_anim->anim_obj;
 
@@ -1132,41 +1169,60 @@ _event_animation_object_get(Eo *eo_obj, Efl_Animation_Event_Type event_type)
 }
 
 static void
-_all_animation_objects_cancel(Eo *eo_obj)
+_all_animation_objects_cancel(Evas_Object_Protected_Data *obj)
 {
-   Efl_Animation_Event_Type event_type;
+   if (obj->event_anims)
-   for (event_type = EFL_ANIMATION_EVENT_TYPE_SHOW;
-        event_type < EFL_ANIMATION_EVENT_TYPE_COUNT; event_type++)
      {
-        Efl_Animation_Object *anim_obj =
+        Event_Animation *event_anim;
-           _event_animation_object_get(eo_obj, event_type);
+        EINA_INLIST_FOREACH(obj->event_anims, event_anim)
-        if (anim_obj)
+          {
-          efl_animation_object_cancel(anim_obj);
+             if (event_anim && event_anim->anim_obj)
+               {
+                  efl_animation_object_cancel(event_anim->anim_obj);
+                  event_anim->anim_obj = NULL;
                }
+          }
+     }
+}
+
+static void
+_animation_end_cb(void *data, const Efl_Event *event EINA_UNUSED)
+{
+   Event_Animation *event_anim = data;
+
+   //Animation Object is automatically deleted when animation is ended.
+   event_anim->anim_obj = NULL;
 }
 
 EOLIAN static Eina_Bool
 _efl_canvas_object_efl_object_event_callback_call(Eo *eo_obj,
-                                                  Evas_Object_Protected_Data *obj EINA_UNUSED,
+                                                  Evas_Object_Protected_Data *obj,
                                                   const Efl_Event_Description *desc,
                                                   void *event_info)
 {
    if (_is_event_blocked(eo_obj, desc, event_info)) return EINA_FALSE;
 
    //Start animation corresponding to the current event
-   if (desc && desc->name)
+   if (desc)
      {
-        Efl_Animation_Event_Type event_type =
+        if (!_efl_animation_event_type_is_inform_call(desc))
-           _efl_animation_event_type_get(desc->name);
+          {
+             Event_Animation *event_anim = _event_animation_find(obj, desc);
+             if (event_anim)
+               {
+                  _all_animation_objects_cancel(obj);
 
-        if (!_efl_animation_event_type_is_inform_call(event_type))
+                  //Create animation object to start animation
-          {
+                  event_anim->anim_obj =
-             Efl_Animation_Object *anim_obj =
+                     efl_animation_object_create(event_anim->anim);
-                _event_animation_object_get(eo_obj, event_type);
+
-             if (anim_obj)
+                  efl_event_callback_add(event_anim->anim_obj,
-               {
+                                         EFL_ANIMATION_OBJECT_EVENT_ENDED,
-                  _all_animation_objects_cancel(eo_obj);
+                                         _animation_end_cb,
-                  efl_animation_object_start(anim_obj);
+                                         event_anim);
+
+                  //Start animation
+                  efl_animation_object_start(event_anim->anim_obj);
                }
           }
      }
@@ -1177,26 +1233,33 @@ _efl_canvas_object_efl_object_event_callback_call(Eo *eo_obj,
 
 EOLIAN static Eina_Bool
 _efl_canvas_object_efl_object_event_callback_legacy_call(Eo *eo_obj,
-                                                         Evas_Object_Protected_Data *obj EINA_UNUSED,
+                                                         Evas_Object_Protected_Data *obj,
                                                          const Efl_Event_Description *desc,
                                                          void *event_info)
 {
    if (_is_event_blocked(eo_obj, desc, event_info)) return EINA_FALSE;
 
    //Start animation corresponding to the current event
-   if (desc && desc->name)
+   if (desc)
      {
-        Efl_Animation_Event_Type event_type =
+        if (!_efl_animation_event_type_is_inform_call(desc))
-           _efl_animation_event_type_get(desc->name);
+          {
+             Event_Animation *event_anim = _event_animation_find(obj, desc);
+             if (event_anim)
+               {
+                  _all_animation_objects_cancel(obj);
 
-        if (!_efl_animation_event_type_is_inform_call(event_type))
+                  //Create animation object to start animation
-          {
+                  event_anim->anim_obj =
-             Efl_Animation_Object *anim_obj =
+                     efl_animation_object_create(event_anim->anim);
-                _event_animation_object_get(eo_obj, event_type);
+
-             if (anim_obj)
+                  efl_event_callback_add(event_anim->anim_obj,
-               {
+                                         EFL_ANIMATION_OBJECT_EVENT_ENDED,
-                  _all_animation_objects_cancel(eo_obj);
+                                         _animation_end_cb,
-                  efl_animation_object_start(anim_obj);
+                                         event_anim);
+
+                  //Start animation
+                  efl_animation_object_start(event_anim->anim_obj);
                }
           }
      }
@@ -1221,14 +1284,6 @@ _efl_canvas_object_efl_object_destructor(Eo *eo_obj, Evas_Object_Protected_Data
 
    edata = efl_data_scope_get(evas_object_evas_get(eo_obj), EVAS_CANVAS_CLASS);
 
-   //Unset event animations
-   efl_canvas_object_event_animation_set(eo_obj, EFL_ANIMATION_EVENT_TYPE_SHOW,
-                                         NULL);
-   efl_canvas_object_event_animation_set(eo_obj, EFL_ANIMATION_EVENT_TYPE_HIDE,
-                                         NULL);
-   efl_canvas_object_event_animation_set(eo_obj,
-                                         EFL_ANIMATION_EVENT_TYPE_CLICKED,
-                                         NULL);
    evas_object_hide(eo_obj);
 
    if (obj->events) EINA_COW_WRITE_BEGIN(evas_object_events_cow, obj->events, Evas_Object_Events_Data, events)
@@ -1853,39 +1908,6 @@ evas_object_hide(Evas_Object *eo_obj)
    efl_gfx_visible_set(eo_obj, EINA_FALSE);
 }
 
-static void _animation_intercept_hide(void *data, Evas_Object *eo_obj);
-
-static void
-_animation_hide_end_cb(void *data, const Efl_Event *event EINA_UNUSED)
-{
-   Hide_Anim_Data *hide_anim_data = data;
-
-   hide_anim_data->anim_ended = EINA_TRUE;
-
-   _animation_intercept_hide(hide_anim_data, hide_anim_data->target);
-
-   hide_anim_data->anim_started = EINA_FALSE;
-   hide_anim_data->anim_ended = EINA_FALSE;
-}
-
-static void
-_animation_intercept_hide(void *data, Evas_Object *eo_obj)
-{
-   Hide_Anim_Data *hide_anim_data = data;
-
-   Efl_Animation_Object *anim_obj =
-      _event_animation_object_get(eo_obj, EFL_ANIMATION_EVENT_TYPE_HIDE);
-   if (anim_obj && !hide_anim_data->anim_started && !hide_anim_data->anim_ended)
-     {
-        hide_anim_data->anim_started = EINA_TRUE;
-
-        _all_animation_objects_cancel(eo_obj);
-        efl_animation_object_start(anim_obj);
-     }
-   else
-     efl_gfx_visible_set(eo_obj, EINA_FALSE);
-}
-
 EAPI Eina_Bool
 evas_object_visible_get(const Evas_Object *obj)
 {
@@ -1928,13 +1950,22 @@ _show(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj)
    evas_object_update_bounding_box(eo_obj, obj, NULL);
    evas_object_inform_call_show(eo_obj);
 
-   //Start animation
+   Event_Animation *event_anim = _event_animation_find(obj, EFL_GFX_EVENT_SHOW);
-   Efl_Animation_Object *anim_obj =
+   if (event_anim)
-      _event_animation_object_get(eo_obj, EFL_ANIMATION_EVENT_TYPE_SHOW);
-   if (anim_obj)
      {
-        _all_animation_objects_cancel(eo_obj);
+        _all_animation_objects_cancel(obj);
-        efl_animation_object_start(anim_obj);
+
+        //Create animation object to start animation
+        event_anim->anim_obj =
+           efl_animation_object_create(event_anim->anim);
+
+        efl_event_callback_add(event_anim->anim_obj,
+                               EFL_ANIMATION_OBJECT_EVENT_ENDED,
+                               _animation_end_cb,
+                               event_anim);
+
+        //Start animation
+        efl_animation_object_start(event_anim->anim_obj);
      }
 }
 
@@ -2733,110 +2764,58 @@ _efl_canvas_object_legacy_ctor(Eo *eo_obj, Evas_Object_Protected_Data *obj)
 EOLIAN void
 _efl_canvas_object_event_animation_set(Eo *eo_obj,
                                        Evas_Object_Protected_Data *pd,
-                                       Efl_Animation_Event_Type event_type,
+                                       const Efl_Event_Description *desc,
                                        Efl_Animation *animation)
 {
-   if (!_efl_animation_event_type_is_valid(event_type))
+   Event_Animation *event_anim = _event_animation_find(pd, desc);
+
+   if (event_anim)
+     {
+        if (event_anim->anim == animation)
           return;
 
-   // This may happen if the object never was fully created.
+        pd->event_anims =
-   if (!pd->event_anims) return;
+           eina_inlist_remove(pd->event_anims, EINA_INLIST_GET(event_anim));
 
-   Event_Animation *event_anim =
+        _event_anim_free(event_anim);
-      eina_array_data_get(pd->event_anims, event_type);
-   if (!event_anim) return;
-
-   Efl_Animation *cur_anim = event_anim->anim;
-   Efl_Animation_Object *cur_anim_obj = event_anim->anim_obj;
-
-   //Unset for current event animation
-   if (cur_anim)
-     {
-        Efl_Canvas_Object *prev_target = efl_animation_target_get(cur_anim);
-
-        //Deallocate memory and Unset callbacks for Hide event
-        if (event_type == EFL_ANIMATION_EVENT_TYPE_HIDE)
-          {
-             Hide_Anim_Data *hide_anim_data
-                = evas_object_intercept_hide_callback_del(prev_target,
-                                                          _animation_intercept_hide);
-             if (hide_anim_data)
-               {
-                  efl_event_callback_del(cur_anim_obj,
-                                         EFL_ANIMATION_OBJECT_EVENT_ENDED,
-                                         _animation_hide_end_cb,
-                                         hide_anim_data);
-
-                  if (hide_anim_data->anim_started &&
-                      !hide_anim_data->anim_ended)
-                    efl_gfx_visible_set(prev_target, EINA_FALSE);
-
-                  free(hide_anim_data);
-               }
      }
 
-        //Stop animation
+   if (!animation) return;
-        efl_animation_object_cancel(cur_anim_obj);
 
-        /* Delete current animation object because animation object is
+   event_anim = calloc(1, sizeof(Event_Animation));
-         * created in efl_canvas_object_event_animation_set(). */
-        efl_del(cur_anim_obj);
-     }
 
-   Efl_Animation *new_anim = animation;
-   Efl_Animation_Object *new_anim_obj = NULL;
-
-   //Set for new event animation
-   if (new_anim)
-     {
    //Set target object for the given animation
-        Efl_Canvas_Object *target = efl_animation_target_get(new_anim);
+   Efl_Canvas_Object *target = efl_animation_target_get(animation);
    if (!target)
      target = eo_obj;
-        efl_animation_target_set(new_anim, target);
+   efl_animation_target_set(animation, target);
 
-        new_anim_obj = efl_animation_object_create(new_anim);
+   //Set callback for Hide event
-
+   if (desc == EFL_GFX_EVENT_HIDE)
-        /* Event animation object should not be deleted after animation is
-         * cancelled or finished */
-        efl_animation_object_auto_del_set(new_anim_obj, EINA_FALSE);
-
-        //Allocate memory and Set callbacks for Hide event
-        if (event_type == EFL_ANIMATION_EVENT_TYPE_HIDE)
      {
-             Hide_Anim_Data *hide_anim_data = calloc(1, sizeof(Hide_Anim_Data));
-             hide_anim_data->target = target;
-             hide_anim_data->anim_started = EINA_FALSE;
-             hide_anim_data->anim_ended = EINA_FALSE;
-
         evas_object_intercept_hide_callback_add(target,
                                                 _animation_intercept_hide,
-                                                     hide_anim_data);
+                                                event_anim);
-
-             efl_event_callback_add(new_anim_obj,
-                                    EFL_ANIMATION_OBJECT_EVENT_ENDED,
-                                    _animation_hide_end_cb,
-                                    hide_anim_data);
-          }
      }
 
-   //Replace current event animation with new event animation
+   event_anim->desc = desc;
-   event_anim->anim = new_anim;
+   event_anim->anim = animation;
-   event_anim->anim_obj = new_anim_obj;
+   event_anim->anim_obj = NULL;
+   event_anim->hide_anim_started = EINA_FALSE;
+   event_anim->hide_anim_ended = EINA_FALSE;
+
+   pd->event_anims =
+      eina_inlist_append(pd->event_anims, EINA_INLIST_GET(event_anim));
 }
 
 EOLIAN Efl_Animation *
 _efl_canvas_object_event_animation_get(Eo *eo_obj EINA_UNUSED,
                                        Evas_Object_Protected_Data *pd,
-                                       Efl_Animation_Event_Type event_type)
+                                       const Efl_Event_Description *desc)
 {
-   if (!_efl_animation_event_type_is_valid(event_type))
+   Event_Animation *event_anim = _event_animation_find(pd, desc);
-     return NULL;
-
-   Event_Animation *event_anim = eina_array_data_get(pd->event_anims,
-                                                     event_type);
    if (event_anim && event_anim->anim)
-     return event_anim->anim;
+     return event_anim->anim_obj;
 
    return NULL;
 }
@@ -2846,9 +2825,11 @@ _efl_canvas_object_event_animation_get(Eo *eo_obj EINA_UNUSED,
  * animation is cancelled and show operation is proceeded. */
 Eina_Bool
 _efl_canvas_object_event_animation_is_running(Eo *eo_obj,
-                                              Efl_Animation_Event_Type event)
+                                              const Efl_Event_Description *desc)
 {
-   if (_event_animation_object_get(eo_obj, event))
+   Evas_Object_Protected_Data *obj = EVAS_OBJECT_DATA_SAFE_GET(eo_obj);
+
+   if (_event_animation_object_get(obj, desc))
      return EINA_TRUE;
 
    return EINA_FALSE;
@@ -2857,7 +2838,9 @@ _efl_canvas_object_event_animation_is_running(Eo *eo_obj,
 void
 _efl_canvas_object_event_animation_cancel(Eo *eo_obj)
 {
-   _all_animation_objects_cancel(eo_obj);
+   Evas_Object_Protected_Data *obj = EVAS_OBJECT_DATA_SAFE_GET(eo_obj);
+
+   _all_animation_objects_cancel(obj);
 }
 
 

src/lib/evas/include/evas_private.h

@@ -1209,7 +1209,7 @@ struct _Evas_Object_Protected_Data
    unsigned char               no_change_render;
    unsigned char               delete_me;
 
-   Eina_Array                 *event_anims; //Array of Efl_Animation
+   Eina_Inlist                *event_anims; //List of Efl_Animation
 
    Eina_Bool                   render_pre : 1;
    Eina_Bool                   rect_del : 1;
@@ -1987,11 +1987,8 @@ void _evas_touch_point_remove(Evas *e, int id);
 void _evas_device_cleanup(Evas *e);
 Evas_Device *_evas_device_top_get(const Evas *e);
 
-/* for animation event count */
-#define EFL_ANIMATION_EVENT_TYPE_COUNT 3
-
 /* to show object if show is called during hide animation */
-Eina_Bool _efl_canvas_object_event_animation_is_running(Eo *eo_obj, Efl_Animation_Event_Type event);
+Eina_Bool _efl_canvas_object_event_animation_is_running(Eo *eo_obj, const Efl_Event_Description *desc);
 void _efl_canvas_object_event_animation_cancel(Eo *eo_obj);
 
 /* legacy/eo events */