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

efl_animation: Change protected methods to be internal methods 

target_state_save, target_state_reset, target_map_reset methods are used
internally.
Therefore, those methods become internal methods.
This commit is contained in:
Jaehyun Cho 2017-10-31 20:19:50 +09:00
parent 57d0617fec
commit a47ecc8713
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/evas/Evas_Internal.h
View File

@ -113,6 +113,10 @@ EOAPI int efl_animation_object_repeat_count_get(const Eo *obj);
EOAPI void efl_animation_object_interpolator_set(Eo *obj, Efl_Object *interpolator);
EOAPI Efl_Object *efl_animation_object_interpolator_get(const Eo *obj);
EOAPI void efl_animation_object_target_state_save(Eo *obj);
EOAPI void efl_animation_object_target_state_reset(Eo *obj);
EOAPI void efl_animation_object_target_map_reset(Eo *obj);
EWAPI extern const Efl_Event_Description _EFL_ANIMATION_OBJECT_EVENT_PRE_STARTED;
#define EFL_ANIMATION_OBJECT_EVENT_PRE_STARTED (&(_EFL_ANIMATION_OBJECT_EVENT_PRE_STARTED))
/* Efl.Animation.Object END */

9
src/lib/evas/canvas/efl_animation_object.c
View File

@ -555,6 +555,10 @@ EOAPI EFL_FUNC_BODY_CONST(efl_animation_object_repeat_count_get, int, 0);
EOAPI EFL_VOID_FUNC_BODYV(efl_animation_object_interpolator_set, EFL_FUNC_CALL(interpolator), Efl_Interpolator *interpolator);
EOAPI EFL_FUNC_BODY_CONST(efl_animation_object_interpolator_get, Efl_Interpolator *, NULL);
EOAPI EFL_VOID_FUNC_BODY(efl_animation_object_target_state_save);
EOAPI EFL_VOID_FUNC_BODY(efl_animation_object_target_state_reset);
EOAPI EFL_VOID_FUNC_BODY(efl_animation_object_target_map_reset);
#define EFL_ANIMATION_OBJECT_EXTRA_OPS \
EFL_OBJECT_OP_FUNC(efl_animation_object_target_set, _efl_animation_object_target_set), \
EFL_OBJECT_OP_FUNC(efl_animation_object_target_get, _efl_animation_object_target_get), \
@ -570,7 +574,10 @@ EOAPI EFL_FUNC_BODY_CONST(efl_animation_object_interpolator_get, Efl_Interpolato
EFL_OBJECT_OP_FUNC(efl_animation_object_repeat_count_set, _efl_animation_object_repeat_count_set), \
EFL_OBJECT_OP_FUNC(efl_animation_object_repeat_count_get, _efl_animation_object_repeat_count_get), \
EFL_OBJECT_OP_FUNC(efl_animation_object_interpolator_set, _efl_animation_object_interpolator_set), \
EFL_OBJECT_OP_FUNC(efl_animation_object_interpolator_get, _efl_animation_object_interpolator_get)
EFL_OBJECT_OP_FUNC(efl_animation_object_interpolator_get, _efl_animation_object_interpolator_get), \
EFL_OBJECT_OP_FUNC(efl_animation_object_target_state_save, _efl_animation_object_target_state_save), \
EFL_OBJECT_OP_FUNC(efl_animation_object_target_state_reset, _efl_animation_object_target_state_reset), \
EFL_OBJECT_OP_FUNC(efl_animation_object_target_map_reset, _efl_animation_object_target_map_reset)
EWAPI const Efl_Event_Description _EFL_ANIMATION_OBJECT_EVENT_PRE_STARTED =
EFL_EVENT_DESCRIPTION("pre_started");

9
src/lib/evas/canvas/efl_animation_object.eo
View File

@ -26,15 +26,6 @@ class Efl.Animation.Object (Efl.Object)
resume {
[[Resume animation.]]
}
target_state_save @protected {
[[Save the state of the target.]]
}
target_state_reset @protected {
[[Reset the state of the target to the previously saved state.]]
}
target_map_reset @protected {
[[Reset the map effect of the target.]]
}
progress_set @protected {
[[Display the moment of animation according to the given progress.]]
params {

5
src/lib/evas/canvas/efl_animation_object_group.c
View File

@ -192,6 +192,9 @@ EOAPI EFL_FUNC_BODY(efl_animation_object_group_objects_get, Eina_List *, NULL);
EFL_OBJECT_OP_FUNC(efl_animation_object_target_set, _efl_animation_object_group_efl_animation_object_target_set), \
EFL_OBJECT_OP_FUNC(efl_animation_object_duration_set, _efl_animation_object_group_efl_animation_object_duration_set), \
EFL_OBJECT_OP_FUNC(efl_animation_object_final_state_keep_set, _efl_animation_object_group_efl_animation_object_final_state_keep_set), \
EFL_OBJECT_OP_FUNC(efl_animation_object_interpolator_set, _efl_animation_object_group_efl_animation_object_interpolator_set)
EFL_OBJECT_OP_FUNC(efl_animation_object_interpolator_set, _efl_animation_object_group_efl_animation_object_interpolator_set), \
EFL_OBJECT_OP_FUNC(efl_animation_object_target_state_save, _efl_animation_object_group_efl_animation_object_target_state_save), \
EFL_OBJECT_OP_FUNC(efl_animation_object_target_state_reset, _efl_animation_object_group_efl_animation_object_target_state_reset), \
EFL_OBJECT_OP_FUNC(efl_animation_object_target_map_reset, _efl_animation_object_group_efl_animation_object_target_map_reset)
#include "efl_animation_object_group.eo.c"

3
src/lib/evas/canvas/efl_animation_object_group.eo
View File

@ -7,8 +7,5 @@ abstract Efl.Animation.Object.Group (Efl.Animation.Object)
implements {
Efl.Object.constructor;
Efl.Object.destructor;
Efl.Animation.Object.target_state_save;
Efl.Animation.Object.target_state_reset;
Efl.Animation.Object.target_map_reset;
}
}