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

efl_canvas_animation_group: remove implicit children behaviour 

you could set the duration of the group to all children, however, the
default behaviour was to not do that. This is however a bit probeblatic,
and needs to be more expclicit. If this is needed again, then this can
be reintroduced, however, not in this form.

ref T8437
Depends on D10798

Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es>
Differential Revision: https://phab.enlightenment.org/D10799
This commit is contained in:
Marcel Hollerbach 2019-12-04 14:20:43 +01:00
parent 752855825d
commit a6c102df1f
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib/evas/Evas_Common.h
View File

@ -3482,7 +3482,6 @@ typedef Eo Efl_Animation_Group_Sequential;
#endif #endif
#define EFL_ANIMATION_GROUP_DURATION_NONE -1
#define EFL_ANIMATION_REPEAT_INFINITE -1 #define EFL_ANIMATION_REPEAT_INFINITE -1
// The below type are necessary for legacy API and need to be manually kept in sync with .eo file. // The below type are necessary for legacy API and need to be manually kept in sync with .eo file.

1
src/lib/evas/Evas_Eo.h
View File

@ -122,7 +122,6 @@ typedef Eo Efl_Canvas_Animation_Group_Sequential;
#endif #endif
#define EFL_ANIMATION_GROUP_DURATION_NONE -1
#define EFL_ANIMATION_REPEAT_INFINITE -1 #define EFL_ANIMATION_REPEAT_INFINITE -1
struct _Efl_Canvas_Animation_Player_Event_Running struct _Efl_Canvas_Animation_Player_Event_Running

14
src/lib/evas/canvas/efl_canvas_animation_group.c
View File

@ -8,9 +8,6 @@ _efl_canvas_animation_group_animation_add(Eo *eo_obj,
if (!animation) return; if (!animation) return;
double duration = efl_animation_duration_get(efl_super(eo_obj, MY_CLASS)); double duration = efl_animation_duration_get(efl_super(eo_obj, MY_CLASS));
/* if group animation duration is available value, then the duration is
* propagated to its child. */
if (duration != EFL_ANIMATION_GROUP_DURATION_NONE)
efl_animation_duration_set(animation, duration); efl_animation_duration_set(animation, duration);
Eina_Bool keep_final_state = efl_animation_final_state_keep_get(eo_obj); Eina_Bool keep_final_state = efl_animation_final_state_keep_get(eo_obj);
@ -53,9 +50,8 @@ _efl_canvas_animation_group_efl_canvas_animation_duration_set(Eo *eo_obj,
Efl_Canvas_Animation_Group_Data *pd, Efl_Canvas_Animation_Group_Data *pd,
double duration) double duration)
{ {
if (duration == EFL_ANIMATION_GROUP_DURATION_NONE) goto end; efl_animation_duration_set(efl_super(eo_obj, MY_CLASS), duration);
duration = efl_animation_duration_get(eo_obj);
if (duration < 0.0) return;
Eina_List *l; Eina_List *l;
Efl_Canvas_Animation *anim; Efl_Canvas_Animation *anim;
@ -63,9 +59,6 @@ _efl_canvas_animation_group_efl_canvas_animation_duration_set(Eo *eo_obj,
{ {
efl_animation_duration_set(anim, duration); efl_animation_duration_set(anim, duration);
} }
end:
efl_animation_duration_set(efl_super(eo_obj, MY_CLASS), duration);
} }
EOLIAN static void EOLIAN static void
@ -106,9 +99,6 @@ _efl_canvas_animation_group_efl_object_constructor(Eo *eo_obj,
pd->animations = NULL; pd->animations = NULL;
//group animation does not affect its child duration by default.
efl_animation_duration_set(eo_obj, EFL_ANIMATION_GROUP_DURATION_NONE);
return eo_obj; return eo_obj;
} }