diff options
author | Jaehyun Cho <jae_hyun.cho@samsung.com> | 2017-10-31 20:19:50 +0900 |
---|---|---|
committer | Jaehyun Cho <jae_hyun.cho@samsung.com> | 2017-10-31 20:36:49 +0900 |
commit | a47ecc87139d2a190b975dbf15709585b0677284 (patch) | |
tree | a98f5d2dae5996defb91accad62e2a2278fa5bde /src | |
parent | 57d0617fec179c4fa63c30766d861e619c9856c5 (diff) |
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.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/evas/Evas_Internal.h | 4 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_animation_object.c | 9 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_animation_object.eo | 9 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_animation_object_group.c | 5 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_animation_object_group.eo | 3 |
5 files changed, 16 insertions, 14 deletions
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h index f2fa838863..2a84270917 100644 --- a/src/lib/evas/Evas_Internal.h +++ b/src/lib/evas/Evas_Internal.h | |||
@@ -113,6 +113,10 @@ EOAPI int efl_animation_object_repeat_count_get(const Eo *obj); | |||
113 | EOAPI void efl_animation_object_interpolator_set(Eo *obj, Efl_Object *interpolator); | 113 | EOAPI void efl_animation_object_interpolator_set(Eo *obj, Efl_Object *interpolator); |
114 | EOAPI Efl_Object *efl_animation_object_interpolator_get(const Eo *obj); | 114 | EOAPI Efl_Object *efl_animation_object_interpolator_get(const Eo *obj); |
115 | 115 | ||
116 | EOAPI void efl_animation_object_target_state_save(Eo *obj); | ||
117 | EOAPI void efl_animation_object_target_state_reset(Eo *obj); | ||
118 | EOAPI void efl_animation_object_target_map_reset(Eo *obj); | ||
119 | |||
116 | EWAPI extern const Efl_Event_Description _EFL_ANIMATION_OBJECT_EVENT_PRE_STARTED; | 120 | EWAPI extern const Efl_Event_Description _EFL_ANIMATION_OBJECT_EVENT_PRE_STARTED; |
117 | #define EFL_ANIMATION_OBJECT_EVENT_PRE_STARTED (&(_EFL_ANIMATION_OBJECT_EVENT_PRE_STARTED)) | 121 | #define EFL_ANIMATION_OBJECT_EVENT_PRE_STARTED (&(_EFL_ANIMATION_OBJECT_EVENT_PRE_STARTED)) |
118 | /* Efl.Animation.Object END */ | 122 | /* Efl.Animation.Object END */ |
diff --git a/src/lib/evas/canvas/efl_animation_object.c b/src/lib/evas/canvas/efl_animation_object.c index 03c531af02..87d1988c91 100644 --- a/src/lib/evas/canvas/efl_animation_object.c +++ b/src/lib/evas/canvas/efl_animation_object.c | |||
@@ -555,6 +555,10 @@ EOAPI EFL_FUNC_BODY_CONST(efl_animation_object_repeat_count_get, int, 0); | |||
555 | EOAPI EFL_VOID_FUNC_BODYV(efl_animation_object_interpolator_set, EFL_FUNC_CALL(interpolator), Efl_Interpolator *interpolator); | 555 | EOAPI EFL_VOID_FUNC_BODYV(efl_animation_object_interpolator_set, EFL_FUNC_CALL(interpolator), Efl_Interpolator *interpolator); |
556 | EOAPI EFL_FUNC_BODY_CONST(efl_animation_object_interpolator_get, Efl_Interpolator *, NULL); | 556 | EOAPI EFL_FUNC_BODY_CONST(efl_animation_object_interpolator_get, Efl_Interpolator *, NULL); |
557 | 557 | ||
558 | EOAPI EFL_VOID_FUNC_BODY(efl_animation_object_target_state_save); | ||
559 | EOAPI EFL_VOID_FUNC_BODY(efl_animation_object_target_state_reset); | ||
560 | EOAPI EFL_VOID_FUNC_BODY(efl_animation_object_target_map_reset); | ||
561 | |||
558 | #define EFL_ANIMATION_OBJECT_EXTRA_OPS \ | 562 | #define EFL_ANIMATION_OBJECT_EXTRA_OPS \ |
559 | EFL_OBJECT_OP_FUNC(efl_animation_object_target_set, _efl_animation_object_target_set), \ | 563 | EFL_OBJECT_OP_FUNC(efl_animation_object_target_set, _efl_animation_object_target_set), \ |
560 | EFL_OBJECT_OP_FUNC(efl_animation_object_target_get, _efl_animation_object_target_get), \ | 564 | 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 | |||
570 | EFL_OBJECT_OP_FUNC(efl_animation_object_repeat_count_set, _efl_animation_object_repeat_count_set), \ | 574 | EFL_OBJECT_OP_FUNC(efl_animation_object_repeat_count_set, _efl_animation_object_repeat_count_set), \ |
571 | EFL_OBJECT_OP_FUNC(efl_animation_object_repeat_count_get, _efl_animation_object_repeat_count_get), \ | 575 | EFL_OBJECT_OP_FUNC(efl_animation_object_repeat_count_get, _efl_animation_object_repeat_count_get), \ |
572 | EFL_OBJECT_OP_FUNC(efl_animation_object_interpolator_set, _efl_animation_object_interpolator_set), \ | 576 | EFL_OBJECT_OP_FUNC(efl_animation_object_interpolator_set, _efl_animation_object_interpolator_set), \ |
573 | EFL_OBJECT_OP_FUNC(efl_animation_object_interpolator_get, _efl_animation_object_interpolator_get) | 577 | EFL_OBJECT_OP_FUNC(efl_animation_object_interpolator_get, _efl_animation_object_interpolator_get), \ |
578 | EFL_OBJECT_OP_FUNC(efl_animation_object_target_state_save, _efl_animation_object_target_state_save), \ | ||
579 | EFL_OBJECT_OP_FUNC(efl_animation_object_target_state_reset, _efl_animation_object_target_state_reset), \ | ||
580 | EFL_OBJECT_OP_FUNC(efl_animation_object_target_map_reset, _efl_animation_object_target_map_reset) | ||
574 | 581 | ||
575 | EWAPI const Efl_Event_Description _EFL_ANIMATION_OBJECT_EVENT_PRE_STARTED = | 582 | EWAPI const Efl_Event_Description _EFL_ANIMATION_OBJECT_EVENT_PRE_STARTED = |
576 | EFL_EVENT_DESCRIPTION("pre_started"); | 583 | EFL_EVENT_DESCRIPTION("pre_started"); |
diff --git a/src/lib/evas/canvas/efl_animation_object.eo b/src/lib/evas/canvas/efl_animation_object.eo index f7aa02b225..80b33b925a 100644 --- a/src/lib/evas/canvas/efl_animation_object.eo +++ b/src/lib/evas/canvas/efl_animation_object.eo | |||
@@ -26,15 +26,6 @@ class Efl.Animation.Object (Efl.Object) | |||
26 | resume { | 26 | resume { |
27 | [[Resume animation.]] | 27 | [[Resume animation.]] |
28 | } | 28 | } |
29 | target_state_save @protected { | ||
30 | [[Save the state of the target.]] | ||
31 | } | ||
32 | target_state_reset @protected { | ||
33 | [[Reset the state of the target to the previously saved state.]] | ||
34 | } | ||
35 | target_map_reset @protected { | ||
36 | [[Reset the map effect of the target.]] | ||
37 | } | ||
38 | progress_set @protected { | 29 | progress_set @protected { |
39 | [[Display the moment of animation according to the given progress.]] | 30 | [[Display the moment of animation according to the given progress.]] |
40 | params { | 31 | params { |
diff --git a/src/lib/evas/canvas/efl_animation_object_group.c b/src/lib/evas/canvas/efl_animation_object_group.c index b7094d76b8..092ae02809 100644 --- a/src/lib/evas/canvas/efl_animation_object_group.c +++ b/src/lib/evas/canvas/efl_animation_object_group.c | |||
@@ -192,6 +192,9 @@ EOAPI EFL_FUNC_BODY(efl_animation_object_group_objects_get, Eina_List *, NULL); | |||
192 | EFL_OBJECT_OP_FUNC(efl_animation_object_target_set, _efl_animation_object_group_efl_animation_object_target_set), \ | 192 | EFL_OBJECT_OP_FUNC(efl_animation_object_target_set, _efl_animation_object_group_efl_animation_object_target_set), \ |
193 | EFL_OBJECT_OP_FUNC(efl_animation_object_duration_set, _efl_animation_object_group_efl_animation_object_duration_set), \ | 193 | EFL_OBJECT_OP_FUNC(efl_animation_object_duration_set, _efl_animation_object_group_efl_animation_object_duration_set), \ |
194 | EFL_OBJECT_OP_FUNC(efl_animation_object_final_state_keep_set, _efl_animation_object_group_efl_animation_object_final_state_keep_set), \ | 194 | EFL_OBJECT_OP_FUNC(efl_animation_object_final_state_keep_set, _efl_animation_object_group_efl_animation_object_final_state_keep_set), \ |
195 | EFL_OBJECT_OP_FUNC(efl_animation_object_interpolator_set, _efl_animation_object_group_efl_animation_object_interpolator_set) | 195 | EFL_OBJECT_OP_FUNC(efl_animation_object_interpolator_set, _efl_animation_object_group_efl_animation_object_interpolator_set), \ |
196 | EFL_OBJECT_OP_FUNC(efl_animation_object_target_state_save, _efl_animation_object_group_efl_animation_object_target_state_save), \ | ||
197 | EFL_OBJECT_OP_FUNC(efl_animation_object_target_state_reset, _efl_animation_object_group_efl_animation_object_target_state_reset), \ | ||
198 | EFL_OBJECT_OP_FUNC(efl_animation_object_target_map_reset, _efl_animation_object_group_efl_animation_object_target_map_reset) | ||
196 | 199 | ||
197 | #include "efl_animation_object_group.eo.c" | 200 | #include "efl_animation_object_group.eo.c" |
diff --git a/src/lib/evas/canvas/efl_animation_object_group.eo b/src/lib/evas/canvas/efl_animation_object_group.eo index 0ac0787294..1ad80394f0 100644 --- a/src/lib/evas/canvas/efl_animation_object_group.eo +++ b/src/lib/evas/canvas/efl_animation_object_group.eo | |||
@@ -7,8 +7,5 @@ abstract Efl.Animation.Object.Group (Efl.Animation.Object) | |||
7 | implements { | 7 | implements { |
8 | Efl.Object.constructor; | 8 | Efl.Object.constructor; |
9 | Efl.Object.destructor; | 9 | Efl.Object.destructor; |
10 | Efl.Animation.Object.target_state_save; | ||
11 | Efl.Animation.Object.target_state_reset; | ||
12 | Efl.Animation.Object.target_map_reset; | ||
13 | } | 10 | } |
14 | } | 11 | } |