efl_animation: Add group animation instance

7 files changed, 216 insertions, 0 deletions

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 5ca239f507..2171b0f0d5 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -61,6 +61,7 @@ evas_eolian_pub_files = \
 	lib/evas/canvas/efl_animation_instance_rotate.eo \
 	lib/evas/canvas/efl_animation_instance_scale.eo \
 	lib/evas/canvas/efl_animation_instance_translate.eo \
+	lib/evas/canvas/efl_animation_instance_group.eo \
 	$(NULL)
 
 evas_eolian_legacy_files = \
@@ -236,6 +237,7 @@ lib/evas/canvas/efl_animation_instance_alpha.c \
 lib/evas/canvas/efl_animation_instance_rotate.c \
 lib/evas/canvas/efl_animation_instance_scale.c \
 lib/evas/canvas/efl_animation_instance_translate.c \
+lib/evas/canvas/efl_animation_instance_group.c \
 $(NULL)
 
 EXTRA_DIST2 += \
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 25e382d5b3..b4190bb1b9 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -3398,6 +3398,13 @@ typedef Eo Efl_Animation_Instance_Translate;
 
 #endif
 
+#ifndef _EFL_ANIMATION_INSTANCE_GROUP_EO_CLASS_TYPE
+#define _EFL_ANIMATION_INSTANCE_GROUP_EO_CLASS_TYPE
+
+typedef Eo Efl_Animation_Instance_Group;
+
+#endif
+
 struct _Efl_Animation_Instance_Animate_Event_Info
 {
    double progress;
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index d4db252240..975428bb7e 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -77,6 +77,7 @@
 #include "canvas/efl_animation_instance_rotate.eo.h"
 #include "canvas/efl_animation_instance_scale.eo.h"
 #include "canvas/efl_animation_instance_translate.eo.h"
+#include "canvas/efl_animation_instance_group.eo.h"
 #endif /* EFL_EO_API_SUPPORT */
 
 #if defined(EFL_BETA_API_SUPPORT) && defined(EFL_EO_API_SUPPORT)
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index acdc90771a..9cf03f62c0 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -121,6 +121,15 @@ EOAPI void efl_animation_instance_translate_get(const Eo *obj, int *from_x, int
 EOAPI void efl_animation_instance_translate_absolute_set(Eo *obj, int from_x, int from_y, int to_x, int to_y);
 EOAPI void efl_animation_instance_translate_absolute_get(const Eo *obj, int *from_x, int *from_y, int *to_x, int *to_y);
 
+EOAPI void efl_animation_instance_group_instance_add(Eo *obj, Efl_Animation_Instance *animation);
+
+EOAPI void efl_animation_instance_group_instance_del(Eo *obj, Efl_Animation_Instance *animation);
+
+EOAPI Eina_List *efl_animation_instance_group_instances_get(Eo *obj);
+
+EWAPI extern const Efl_Event_Description _EFL_ANIMATION_INSTANCE_GROUP_EVENT_MEMBER_POST_END;
+#define EFL_ANIMATION_INSTANCE_GROUP_EVENT_MEMBER_POST_END (&(_EFL_ANIMATION_INSTANCE_GROUP_EVENT_MEMBER_POST_END))
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/lib/evas/canvas/efl_animation_instance_group.c b/src/lib/evas/canvas/efl_animation_instance_group.c
new file mode 100644
index 0000000000..22096d99e1
--- /dev/null
+++ b/src/lib/evas/canvas/efl_animation_instance_group.c
@@ -0,0 +1,184 @@
+#include "evas_common_private.h"
+#include "evas_private.h"
+
+#define MY_CLASS EFL_ANIMATION_INSTANCE_GROUP_CLASS
+#define MY_CLASS_NAME efl_class_name_get(MY_CLASS)
+
+#define EFL_ANIMATION_INSTANCE_GROUP_CHECK_OR_RETURN(anim, ...) \
+   do { \
+      if (!anim) { \
+         CRI("Efl_Animation_Instance " # anim " is NULL!"); \
+         return __VA_ARGS__; \
+      } \
+      if (efl_animation_instance_is_deleted(anim)) { \
+         ERR("Efl_Animation_Instance " # anim " has already been deleted!"); \
+         return __VA_ARGS__; \
+      } \
+   } while (0)
+
+#define EFL_ANIMATION_INSTANCE_GROUP_DATA_GET(o, pd) \
+   Evas_Object_Animation_Instance_Group_Data *pd = efl_data_scope_get(o, EFL_ANIMATION_INSTANCE_GROUP_CLASS)
+
+struct _Evas_Object_Animation_Instance_Group_Data
+{
+   Eina_List *instances;
+};
+
+EOLIAN static void
+_efl_animation_instance_group_instance_add(Eo *eo_obj,
+                                           Evas_Object_Animation_Instance_Group_Data *pd,
+                                           Efl_Animation_Instance *instance)
+{
+   EFL_ANIMATION_INSTANCE_GROUP_CHECK_OR_RETURN(eo_obj);
+
+   if (!instance) return;
+
+   Efl_Canvas_Object *target = efl_animation_instance_target_get(eo_obj);
+   efl_animation_instance_target_set(instance, target);
+
+   double duration = efl_animation_instance_duration_get(eo_obj);
+   efl_animation_instance_duration_set(instance, duration);
+
+   Eina_Bool state_keep = efl_animation_instance_final_state_keep_get(eo_obj);
+   efl_animation_instance_final_state_keep_set(instance, state_keep);
+
+   pd->instances = eina_list_append(pd->instances, instance);
+}
+
+EOLIAN static void
+_efl_animation_instance_group_instance_del(Eo *eo_obj,
+                                           Evas_Object_Animation_Instance_Group_Data *pd,
+                                           Efl_Animation_Instance *instance)
+{
+   EFL_ANIMATION_INSTANCE_GROUP_CHECK_OR_RETURN(eo_obj);
+
+   if (!instance) return;
+
+   pd->instances = eina_list_remove(pd->instances, instance);
+}
+
+EOLIAN static Eina_List *
+_efl_animation_instance_group_instances_get(Eo *eo_obj,
+                                            Evas_Object_Animation_Instance_Group_Data *pd)
+{
+   EFL_ANIMATION_INSTANCE_GROUP_CHECK_OR_RETURN(eo_obj, NULL);
+
+   return pd->instances;
+}
+
+EOLIAN static void
+_efl_animation_instance_group_efl_animation_instance_target_set(Eo *eo_obj,
+                                                                Evas_Object_Animation_Instance_Group_Data *pd,
+                                                                Efl_Canvas_Object *target)
+{
+   EFL_ANIMATION_INSTANCE_GROUP_CHECK_OR_RETURN(eo_obj);
+
+   Eina_List *l;
+   Efl_Animation_Instance *inst;
+
+   EINA_LIST_FOREACH(pd->instances, l, inst)
+     {
+        efl_animation_instance_target_set(inst, target);
+     }
+
+   efl_animation_instance_target_set(efl_super(eo_obj, MY_CLASS), target);
+}
+
+EOLIAN static void
+_efl_animation_instance_group_efl_animation_instance_duration_set(Eo *eo_obj,
+                                                                  Evas_Object_Animation_Instance_Group_Data *pd,
+                                                                  double duration)
+{
+   EFL_ANIMATION_INSTANCE_GROUP_CHECK_OR_RETURN(eo_obj);
+
+   if (duration <= 0.0) duration = 0.0;
+
+   Eina_List *l;
+   Efl_Animation_Instance *inst;
+
+   EINA_LIST_FOREACH(pd->instances, l, inst)
+     {
+        efl_animation_instance_duration_set(inst, duration);
+     }
+
+   efl_animation_instance_duration_set(efl_super(eo_obj, MY_CLASS), duration);
+}
+
+EOLIAN static void
+_efl_animation_instance_group_efl_animation_instance_final_state_keep_set(Eo *eo_obj,
+                                                                          Evas_Object_Animation_Instance_Group_Data *pd,
+                                                                          Eina_Bool state_keep)
+{
+   EFL_ANIMATION_INSTANCE_GROUP_CHECK_OR_RETURN(eo_obj);
+
+   Eina_List *l;
+   Efl_Animation_Instance *inst;
+
+   EINA_LIST_FOREACH(pd->instances, l, inst)
+     {
+        efl_animation_instance_final_state_keep_set(inst, state_keep);
+     }
+
+   efl_animation_instance_final_state_keep_set(efl_super(eo_obj, MY_CLASS),
+                                               state_keep);
+}
+
+EOLIAN static void
+_efl_animation_instance_group_efl_animation_instance_map_reset(Eo *eo_obj,
+                                                               Evas_Object_Animation_Instance_Group_Data *pd)
+{
+   EFL_ANIMATION_INSTANCE_GROUP_CHECK_OR_RETURN(eo_obj);
+
+   Eina_List *l;
+   Efl_Animation_Instance *inst;
+
+   EINA_LIST_FOREACH(pd->instances, l, inst)
+     {
+        efl_animation_instance_map_reset(inst);
+     }
+}
+
+EOLIAN static Efl_Object *
+_efl_animation_instance_group_efl_object_constructor(Eo *eo_obj,
+                                                     Evas_Object_Animation_Instance_Group_Data *pd)
+{
+   eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS));
+
+   pd->instances = NULL;
+
+   return eo_obj;
+}
+
+EOLIAN static void
+_efl_animation_instance_group_efl_object_destructor(Eo *eo_obj,
+                                                    Evas_Object_Animation_Instance_Group_Data *pd)
+{
+   Efl_Animation_Instance *inst;
+
+   EINA_LIST_FREE(pd->instances, inst)
+     efl_del(inst);
+
+   efl_destructor(efl_super(eo_obj, MY_CLASS));
+}
+
+/* Internal EO APIs */
+
+EOAPI EFL_VOID_FUNC_BODYV(efl_animation_instance_group_instance_add, EFL_FUNC_CALL(animation), Efl_Animation_Instance *animation);
+
+EOAPI EFL_VOID_FUNC_BODYV(efl_animation_instance_group_instance_del, EFL_FUNC_CALL(animation), Efl_Animation_Instance *animation);
+
+EOAPI EFL_FUNC_BODY(efl_animation_instance_group_instances_get, Eina_List *, NULL);
+
+EWAPI const Efl_Event_Description _EFL_ANIMATION_INSTANCE_GROUP_EVENT_MEMBER_POST_END =
+   EFL_EVENT_DESCRIPTION("member_post_end");
+
+#define EFL_ANIMATION_INSTANCE_GROUP_EXTRA_OPS \
+   EFL_OBJECT_OP_FUNC(efl_animation_instance_group_instance_add, _efl_animation_instance_group_instance_add), \
+   EFL_OBJECT_OP_FUNC(efl_animation_instance_group_instance_del, _efl_animation_instance_group_instance_del), \
+   EFL_OBJECT_OP_FUNC(efl_animation_instance_group_instances_get, _efl_animation_instance_group_instances_get), \
+   EFL_OBJECT_OP_FUNC(efl_animation_instance_target_set, _efl_animation_instance_group_efl_animation_instance_target_set), \
+   EFL_OBJECT_OP_FUNC(efl_animation_instance_duration_set, _efl_animation_instance_group_efl_animation_instance_duration_set), \
+   EFL_OBJECT_OP_FUNC(efl_animation_instance_final_state_keep_set, _efl_animation_instance_group_efl_animation_instance_final_state_keep_set), \
+   EFL_OBJECT_OP_FUNC(efl_animation_instance_map_reset, _efl_animation_instance_group_efl_animation_instance_map_reset)
+
+#include "efl_animation_instance_group.eo.c"
diff --git a/src/lib/evas/canvas/efl_animation_instance_group.eo b/src/lib/evas/canvas/efl_animation_instance_group.eo
new file mode 100644
index 0000000000..cdecf55cc4
--- /dev/null
+++ b/src/lib/evas/canvas/efl_animation_instance_group.eo
@@ -0,0 +1,12 @@
+import efl_animation_types;
+
+abstract Efl.Animation.Instance.Group (Efl.Animation.Instance)
+{
+   [[Efl group animation instance abstract class]]
+   legacy_prefix: evas_object_animation_instance;
+   data: Evas_Object_Animation_Instance_Group_Data;
+   implements {
+      Efl.Object.constructor;
+      Efl.Object.destructor;
+   }
+}
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index f5e3477635..391ce0feec 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -118,6 +118,7 @@ typedef struct _Evas_Object_Animation_Instance_Alpha_Data             Evas_Objec
 typedef struct _Evas_Object_Animation_Instance_Rotate_Data            Evas_Object_Animation_Instance_Rotate_Data;
 typedef struct _Evas_Object_Animation_Instance_Scale_Data             Evas_Object_Animation_Instance_Scale_Data;
 typedef struct _Evas_Object_Animation_Instance_Translate_Data         Evas_Object_Animation_Instance_Translate_Data;
+typedef struct _Evas_Object_Animation_Instance_Group_Data             Evas_Object_Animation_Instance_Group_Data;
 typedef struct _Evas_Object_Animation_Instance_Data                   Evas_Object_Animation_Instance_Data;
 
 // 3D stuff