From 40b73758a05d159086b286f26ebd4d1da19da4f9 Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Mon, 20 Jan 2020 12:53:09 +0900 Subject: [PATCH] efl_canvas_animation: rename Animation_XXX to XXX_Animation Summary: In animation classes, "Animation" is not used as a namespace but it is used as a prefix in the class names. e.g. Efl.Canvas.Animation_Alpha However, those classes are basically animation classes with different features. Therefore, "Animation" should be used as a postfix in the class names. e.g. Efl.Canvas.Animation_Alpha -> Efl.Canvas.Alpha_Animation However, for the easier usage of C APIs, c_prefix of animation classes are remained to be "efl_animation_xxx". Reviewers: segfaultxavi, bu5hm4n, zmike, Hermet, jsuya Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D11108 --- src/bin/elementary/test_efl_anim_alpha.c | 4 +- .../elementary/test_efl_anim_group_parallel.c | 8 +-- .../test_efl_anim_group_sequential.c | 8 +-- .../elementary/test_efl_anim_interpolator.c | 2 +- src/bin/elementary/test_efl_anim_pause.c | 4 +- src/bin/elementary/test_efl_anim_repeat.c | 4 +- src/bin/elementary/test_efl_anim_rotate.c | 12 ++-- src/bin/elementary/test_efl_anim_scale.c | 12 ++-- .../elementary/test_efl_anim_start_delay.c | 4 +- src/bin/elementary/test_efl_anim_translate.c | 8 +-- src/examples/evas/efl-canvas-animation.c | 10 +-- .../efl_ui_spotlight_manager_stack.c | 2 +- src/lib/evas/Efl_Canvas.h | 14 ++-- src/lib/evas/Evas_Common.h | 54 +++++++-------- src/lib/evas/Evas_Eo.h | 68 +++++++++---------- ...n_alpha.c => efl_canvas_alpha_animation.c} | 22 +++--- ...alpha.eo => efl_canvas_alpha_animation.eo} | 4 +- .../efl_canvas_alpha_animation_private.h | 19 ++++++ src/lib/evas/canvas/efl_canvas_animation.eo | 4 +- .../efl_canvas_animation_alpha_private.h | 19 ------ .../efl_canvas_animation_group_private.h | 16 ----- .../efl_canvas_animation_rotate_private.h | 30 -------- .../efl_canvas_animation_scale_private.h | 25 ------- .../efl_canvas_animation_translate_private.h | 16 ----- ...n_group.c => efl_canvas_group_animation.c} | 36 +++++----- ...group.eo => efl_canvas_group_animation.eo} | 6 +- .../efl_canvas_group_animation_private.h | 16 +++++ ... => efl_canvas_parallel_group_animation.c} | 10 +-- ...=> efl_canvas_parallel_group_animation.eo} | 5 +- ...canvas_parallel_group_animation_private.h} | 0 ...rotate.c => efl_canvas_rotate_animation.c} | 30 ++++---- ...tate.eo => efl_canvas_rotate_animation.eo} | 6 +- .../efl_canvas_rotate_animation_private.h | 30 ++++++++ ...n_scale.c => efl_canvas_scale_animation.c} | 30 ++++---- ...scale.eo => efl_canvas_scale_animation.eo} | 6 +- .../efl_canvas_scale_animation_private.h | 25 +++++++ ...> efl_canvas_sequential_group_animation.c} | 10 +-- ... efl_canvas_sequential_group_animation.eo} | 4 +- ...nvas_sequential_group_animation_private.h} | 0 ...ate.c => efl_canvas_translate_animation.c} | 30 ++++---- ...e.eo => efl_canvas_translate_animation.eo} | 6 +- .../efl_canvas_translate_animation_private.h | 16 +++++ src/lib/evas/canvas/meson.build | 28 ++++---- 43 files changed, 334 insertions(+), 329 deletions(-) rename src/lib/evas/canvas/{efl_canvas_animation_alpha.c => efl_canvas_alpha_animation.c} (64%) rename src/lib/evas/canvas/{efl_canvas_animation_alpha.eo => efl_canvas_alpha_animation.eo} (87%) create mode 100644 src/lib/evas/canvas/efl_canvas_alpha_animation_private.h delete mode 100644 src/lib/evas/canvas/efl_canvas_animation_alpha_private.h delete mode 100644 src/lib/evas/canvas/efl_canvas_animation_group_private.h delete mode 100644 src/lib/evas/canvas/efl_canvas_animation_rotate_private.h delete mode 100644 src/lib/evas/canvas/efl_canvas_animation_scale_private.h delete mode 100644 src/lib/evas/canvas/efl_canvas_animation_translate_private.h rename src/lib/evas/canvas/{efl_canvas_animation_group.c => efl_canvas_group_animation.c} (71%) rename src/lib/evas/canvas/{efl_canvas_animation_group.eo => efl_canvas_group_animation.eo} (85%) create mode 100644 src/lib/evas/canvas/efl_canvas_group_animation_private.h rename src/lib/evas/canvas/{efl_canvas_animation_group_parallel.c => efl_canvas_parallel_group_animation.c} (89%) rename src/lib/evas/canvas/{efl_canvas_animation_group_parallel.eo => efl_canvas_parallel_group_animation.eo} (70%) rename src/lib/evas/canvas/{efl_canvas_animation_group_parallel_private.h => efl_canvas_parallel_group_animation_private.h} (100%) rename src/lib/evas/canvas/{efl_canvas_animation_rotate.c => efl_canvas_rotate_animation.c} (75%) rename src/lib/evas/canvas/{efl_canvas_animation_rotate.eo => efl_canvas_rotate_animation.eo} (94%) create mode 100644 src/lib/evas/canvas/efl_canvas_rotate_animation_private.h rename src/lib/evas/canvas/{efl_canvas_animation_scale.c => efl_canvas_scale_animation.c} (75%) rename src/lib/evas/canvas/{efl_canvas_animation_scale.eo => efl_canvas_scale_animation.eo} (95%) create mode 100644 src/lib/evas/canvas/efl_canvas_scale_animation_private.h rename src/lib/evas/canvas/{efl_canvas_animation_group_sequential.c => efl_canvas_sequential_group_animation.c} (90%) rename src/lib/evas/canvas/{efl_canvas_animation_group_sequential.eo => efl_canvas_sequential_group_animation.eo} (78%) rename src/lib/evas/canvas/{efl_canvas_animation_group_sequential_private.h => efl_canvas_sequential_group_animation_private.h} (100%) rename src/lib/evas/canvas/{efl_canvas_animation_translate.c => efl_canvas_translate_animation.c} (70%) rename src/lib/evas/canvas/{efl_canvas_animation_translate.eo => efl_canvas_translate_animation.eo} (92%) create mode 100644 src/lib/evas/canvas/efl_canvas_translate_animation_private.h diff --git a/src/bin/elementary/test_efl_anim_alpha.c b/src/bin/elementary/test_efl_anim_alpha.c index b364319279..3c5f62ca64 100644 --- a/src/bin/elementary/test_efl_anim_alpha.c +++ b/src/bin/elementary/test_efl_anim_alpha.c @@ -90,13 +90,13 @@ test_efl_anim_alpha(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * efl_event_callback_array_add(btn, animation_stats_cb(), ad); //Show Animation - Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); + Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win); efl_animation_alpha_set(show_anim, 0.0, 1.0); efl_animation_duration_set(show_anim, 1.0); efl_animation_final_state_keep_set(show_anim, EINA_TRUE); //Hide Animation - Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); + Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win); efl_animation_alpha_set(hide_anim, 1.0, 0.0); efl_animation_duration_set(hide_anim, 1.0); efl_animation_final_state_keep_set(hide_anim, EINA_TRUE); diff --git a/src/bin/elementary/test_efl_anim_group_parallel.c b/src/bin/elementary/test_efl_anim_group_parallel.c index 728c54ea4e..d560023f2c 100644 --- a/src/bin/elementary/test_efl_anim_group_parallel.c +++ b/src/bin/elementary/test_efl_anim_group_parallel.c @@ -88,19 +88,19 @@ test_efl_anim_group_parallel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE efl_event_callback_array_add(btn, animation_stats_cb(), ad); //Hide Animation - Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); + Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win); efl_animation_alpha_set(hide_anim, 1.0, 0.0); //Rotate from 0 to 45 degrees Animation - Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); + Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win); efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, EINA_VECTOR2(0.5, 0.5)); //Scale Animation to zoom in - Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); + Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win); efl_animation_scale_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), NULL, EINA_VECTOR2(0.5, 0.5)); //Hide Parallel Group Animation - Efl_Canvas_Animation *parallel_hide_anim = efl_add(EFL_CANVAS_ANIMATION_GROUP_PARALLEL_CLASS, win); + Efl_Canvas_Animation *parallel_hide_anim = efl_add(EFL_CANVAS_PARALLEL_GROUP_ANIMATION_CLASS, win); efl_animation_duration_set(parallel_hide_anim, 1.0); efl_animation_final_state_keep_set(parallel_hide_anim, EINA_TRUE); diff --git a/src/bin/elementary/test_efl_anim_group_sequential.c b/src/bin/elementary/test_efl_anim_group_sequential.c index 60b3a836a1..62b00a669e 100644 --- a/src/bin/elementary/test_efl_anim_group_sequential.c +++ b/src/bin/elementary/test_efl_anim_group_sequential.c @@ -89,19 +89,19 @@ test_efl_anim_group_sequential(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU /* Animations to hide button */ //Rotate from 0 to 45 degrees Animation - Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); + Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win); efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, EINA_VECTOR2(0.5, 0.5)); //Scale Animation to zoom in - Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); + Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win); efl_animation_scale_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), NULL, EINA_VECTOR2(0.5, 0.5)); //Hide Animation - Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); + Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win); efl_animation_alpha_set(hide_anim, 1.0, 0.0); //Hide Sequential Group Animation - Efl_Canvas_Animation *sequential_hide_anim = efl_add(EFL_CANVAS_ANIMATION_GROUP_SEQUENTIAL_CLASS, win); + Efl_Canvas_Animation *sequential_hide_anim = efl_add(EFL_CANVAS_SEQUENTIAL_GROUP_ANIMATION_CLASS, win); efl_animation_duration_set(sequential_hide_anim, 1.0); efl_animation_final_state_keep_set(sequential_hide_anim, EINA_TRUE); diff --git a/src/bin/elementary/test_efl_anim_interpolator.c b/src/bin/elementary/test_efl_anim_interpolator.c index c5a828ff22..e6c42b711c 100644 --- a/src/bin/elementary/test_efl_anim_interpolator.c +++ b/src/bin/elementary/test_efl_anim_interpolator.c @@ -202,7 +202,7 @@ test_efl_anim_interpolator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, ad->btn[i] = btn; Efl_Canvas_Animation *anim = - efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); + efl_add(EFL_CANVAS_TRANSLATE_ANIMATION_CLASS, win); efl_animation_translate_set(anim, EINA_POSITION2D(0, 0), EINA_POSITION2D((WIN_W - BTN_W), 0)); efl_animation_duration_set(anim, 2.0); efl_animation_final_state_keep_set(anim, EINA_FALSE); diff --git a/src/bin/elementary/test_efl_anim_pause.c b/src/bin/elementary/test_efl_anim_pause.c index 92d4b3e308..8585b38fac 100644 --- a/src/bin/elementary/test_efl_anim_pause.c +++ b/src/bin/elementary/test_efl_anim_pause.c @@ -115,13 +115,13 @@ test_efl_anim_pause(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * efl_event_callback_array_add(btn, animation_stats_cb(), ad); //Show Animation - Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); + Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win); efl_animation_alpha_set(show_anim, 0.0, 1.0); efl_animation_duration_set(show_anim, 2.0); efl_animation_final_state_keep_set(show_anim, EINA_TRUE); //Hide Animation - Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); + Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win); efl_animation_alpha_set(hide_anim, 1.0, 0.0); efl_animation_duration_set(hide_anim, 2.0); efl_animation_final_state_keep_set(hide_anim, EINA_TRUE); diff --git a/src/bin/elementary/test_efl_anim_repeat.c b/src/bin/elementary/test_efl_anim_repeat.c index b3dddcd0e3..26e3d3f00f 100644 --- a/src/bin/elementary/test_efl_anim_repeat.c +++ b/src/bin/elementary/test_efl_anim_repeat.c @@ -137,13 +137,13 @@ test_efl_anim_repeat(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_event_callback_array_add(btn, animation_stats_cb(), ad); //Show Animation - Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); + Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win); efl_animation_alpha_set(show_anim, 0.0, 1.0); efl_animation_duration_set(show_anim, 1.0); efl_animation_final_state_keep_set(show_anim, EINA_TRUE); //Hide Animation - Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); + Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win); efl_animation_alpha_set(hide_anim, 1.0, 0.0); efl_animation_duration_set(hide_anim, 1.0); efl_animation_final_state_keep_set(hide_anim, EINA_TRUE); diff --git a/src/bin/elementary/test_efl_anim_rotate.c b/src/bin/elementary/test_efl_anim_rotate.c index 437d015d75..4e3434cf41 100644 --- a/src/bin/elementary/test_efl_anim_rotate.c +++ b/src/bin/elementary/test_efl_anim_rotate.c @@ -88,13 +88,13 @@ test_efl_anim_rotate(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void efl_event_callback_array_add(btn, animation_stats_cb(), ad); //Rotate from 0 to 45 degrees Animation - Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); + Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win); efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, NULL, EINA_VECTOR2(0.5, 0.5)); efl_animation_duration_set(cw_45_degrees_anim, 1.0); efl_animation_final_state_keep_set(cw_45_degrees_anim, EINA_TRUE); //Rotate from 45 to 0 degrees Animation - Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); + Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win); efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, NULL, EINA_VECTOR2(0.5, 0.5)); efl_animation_duration_set(ccw_45_degrees_anim, 1.0); efl_animation_final_state_keep_set(ccw_45_degrees_anim, EINA_TRUE); @@ -147,13 +147,13 @@ test_efl_anim_rotate_relative(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS evas_object_show(pivot); //Rotate from 0 to 45 degrees Animation - Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); + Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win); efl_animation_rotate_set(cw_45_degrees_anim, 0.0, 45.0, pivot, EINA_VECTOR2(0.5, 0.5)); efl_animation_duration_set(cw_45_degrees_anim, 1.0); efl_animation_final_state_keep_set(cw_45_degrees_anim, EINA_TRUE); //Rotate from 45 to 0 degrees Animation - Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); + Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win); efl_animation_rotate_set(ccw_45_degrees_anim, 45.0, 0.0, pivot, EINA_VECTOR2(0.5, 0.5)); efl_animation_duration_set(ccw_45_degrees_anim, 1.0); efl_animation_final_state_keep_set(ccw_45_degrees_anim, EINA_TRUE); @@ -206,13 +206,13 @@ test_efl_anim_rotate_absolute(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS evas_object_show(abs_center); //Rotate from 0 to 45 degrees Animation - Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); + Efl_Canvas_Animation *cw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win); efl_animation_rotate_absolute_set(cw_45_degrees_anim, 0.0, 45.0, EINA_POSITION2D(0, 0)); efl_animation_duration_set(cw_45_degrees_anim, 1.0); efl_animation_final_state_keep_set(cw_45_degrees_anim, EINA_TRUE); //Rotate from 45 to 0 degrees Animation - Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ANIMATION_ROTATE_CLASS, win); + Efl_Canvas_Animation *ccw_45_degrees_anim = efl_add(EFL_CANVAS_ROTATE_ANIMATION_CLASS, win); efl_animation_rotate_absolute_set(ccw_45_degrees_anim, 45.0, 0.0, EINA_POSITION2D(0, 0)); efl_animation_duration_set(ccw_45_degrees_anim, 1.0); efl_animation_final_state_keep_set(ccw_45_degrees_anim, EINA_TRUE); diff --git a/src/bin/elementary/test_efl_anim_scale.c b/src/bin/elementary/test_efl_anim_scale.c index 93ac1f7270..6653772299 100644 --- a/src/bin/elementary/test_efl_anim_scale.c +++ b/src/bin/elementary/test_efl_anim_scale.c @@ -88,13 +88,13 @@ test_efl_anim_scale(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * efl_event_callback_array_add(btn, animation_stats_cb(), ad); //Scale Animation to zoom in - Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); + Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win); efl_animation_scale_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), NULL, EINA_VECTOR2(0.5, 0.5)); efl_animation_duration_set(scale_double_anim, 1.0); efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE); //Scale Animation to zoom out - Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); + Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win); efl_animation_scale_set(scale_half_anim, EINA_VECTOR2(2.0, 2.0), EINA_VECTOR2(1.0, 1.0), NULL, EINA_VECTOR2(0.5, 0.5)); efl_animation_duration_set(scale_half_anim, 1.0); efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE); @@ -147,13 +147,13 @@ test_efl_anim_scale_relative(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE evas_object_show(pivot); //Scale Animation to zoom in - Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); + Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win); efl_animation_scale_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), pivot, EINA_VECTOR2(0.5, 0.5)); efl_animation_duration_set(scale_double_anim, 1.0); efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE); //Scale Animation to zoom out - Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); + Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win); efl_animation_scale_set(scale_half_anim, EINA_VECTOR2(2.0, 2.0), EINA_VECTOR2(1.0, 1.0), pivot, EINA_VECTOR2(0.5, 0.5)); efl_animation_duration_set(scale_half_anim, 1.0); efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE); @@ -206,13 +206,13 @@ test_efl_anim_scale_absolute(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE evas_object_show(abs_center); //Scale Animation to zoom in - Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); + Efl_Canvas_Animation *scale_double_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win); efl_animation_scale_absolute_set(scale_double_anim, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(2.0, 2.0), EINA_POSITION2D(0, 0)); efl_animation_duration_set(scale_double_anim, 1.0); efl_animation_final_state_keep_set(scale_double_anim, EINA_TRUE); //Scale Animation to zoom out - Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_ANIMATION_SCALE_CLASS, win); + Efl_Canvas_Animation *scale_half_anim = efl_add(EFL_CANVAS_SCALE_ANIMATION_CLASS, win); efl_animation_scale_absolute_set(scale_half_anim, EINA_VECTOR2(2.0, 2.0), EINA_VECTOR2(1.0, 1.0), EINA_POSITION2D(0, 0)); efl_animation_duration_set(scale_half_anim, 1.0); efl_animation_final_state_keep_set(scale_half_anim, EINA_TRUE); diff --git a/src/bin/elementary/test_efl_anim_start_delay.c b/src/bin/elementary/test_efl_anim_start_delay.c index 6ef663b33a..ae41fc7f30 100644 --- a/src/bin/elementary/test_efl_anim_start_delay.c +++ b/src/bin/elementary/test_efl_anim_start_delay.c @@ -102,13 +102,13 @@ test_efl_anim_start_delay(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, efl_event_callback_array_add(btn, animation_stats_cb(), ad); //Show Animation - Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); + Efl_Canvas_Animation *show_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win); efl_animation_alpha_set(show_anim, 0.0, 1.0); efl_animation_duration_set(show_anim, 1.0); efl_animation_final_state_keep_set(show_anim, EINA_TRUE); //Hide Animation - Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, win); + Efl_Canvas_Animation *hide_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, win); efl_animation_alpha_set(hide_anim, 1.0, 0.0); efl_animation_duration_set(hide_anim, 1.0); efl_animation_final_state_keep_set(hide_anim, EINA_TRUE); diff --git a/src/bin/elementary/test_efl_anim_translate.c b/src/bin/elementary/test_efl_anim_translate.c index 7617be87d1..c1a3165d45 100644 --- a/src/bin/elementary/test_efl_anim_translate.c +++ b/src/bin/elementary/test_efl_anim_translate.c @@ -88,13 +88,13 @@ test_efl_anim_translate(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo efl_event_callback_array_add(btn, animation_stats_cb(), ad); //Translate Animation to right bottom relatively - Efl_Canvas_Animation *translate_rb_anim = efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); + Efl_Canvas_Animation *translate_rb_anim = efl_add(EFL_CANVAS_TRANSLATE_ANIMATION_CLASS, win); efl_animation_translate_set(translate_rb_anim, EINA_POSITION2D(0, 0), EINA_POSITION2D(100, 100)); efl_animation_duration_set(translate_rb_anim, 1.0); efl_animation_final_state_keep_set(translate_rb_anim, EINA_TRUE); //Translate Animation to left top relatively - Efl_Canvas_Animation *translate_lt_anim = efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); + Efl_Canvas_Animation *translate_lt_anim = efl_add(EFL_CANVAS_TRANSLATE_ANIMATION_CLASS, win); efl_animation_translate_set(translate_lt_anim, EINA_POSITION2D(100, 100), EINA_POSITION2D(0, 0)); efl_animation_duration_set(translate_lt_anim, 1.0); efl_animation_final_state_keep_set(translate_lt_anim, EINA_TRUE); @@ -147,13 +147,13 @@ test_efl_anim_translate_absolute(void *data EINA_UNUSED, Evas_Object *obj EINA_U evas_object_show(abs_center); //Translate Animation to right bottom absolutely - Efl_Canvas_Animation *translate_rb_anim = efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); + Efl_Canvas_Animation *translate_rb_anim = efl_add(EFL_CANVAS_TRANSLATE_ANIMATION_CLASS, win); efl_animation_translate_absolute_set(translate_rb_anim, EINA_POSITION2D(0, 0), EINA_POSITION2D(100, 100)); efl_animation_duration_set(translate_rb_anim, 1.0); efl_animation_final_state_keep_set(translate_rb_anim, EINA_TRUE); //Translate Animation to left top absolutely - Efl_Canvas_Animation *translate_lt_anim = efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); + Efl_Canvas_Animation *translate_lt_anim = efl_add(EFL_CANVAS_TRANSLATE_ANIMATION_CLASS, win); efl_animation_translate_absolute_set(translate_lt_anim, EINA_POSITION2D(100, 100), EINA_POSITION2D(0, 0)); efl_animation_duration_set(translate_lt_anim, 1.0); efl_animation_final_state_keep_set(translate_lt_anim, EINA_TRUE); diff --git a/src/examples/evas/efl-canvas-animation.c b/src/examples/evas/efl-canvas-animation.c index cc24550dea..a9058c50d6 100644 --- a/src/examples/evas/efl-canvas-animation.c +++ b/src/examples/evas/efl-canvas-animation.c @@ -114,7 +114,7 @@ main(void) Evas_Object *scale_rect = _new_rectangle_add(d.evas); efl_gfx_entity_geometry_set(scale_rect, EINA_RECT(50, 50, 50, 50)); efl_canvas_object_animation_start(scale_rect, - efl_new(EFL_CANVAS_ANIMATION_SCALE_CLASS, + efl_new(EFL_CANVAS_SCALE_ANIMATION_CLASS, efl_animation_scale_set(efl_added, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(3.0, 3.0), scale_rect, EINA_VECTOR2(0.5, 0.5)), efl_animation_start_delay_set(efl_added, 5.0), efl_animation_duration_set(efl_added, 2.0), @@ -125,7 +125,7 @@ main(void) Evas_Object *scale_rect2 = _new_rectangle_add(d.evas); efl_gfx_entity_geometry_set(scale_rect2, EINA_RECT(50, 200, 50, 50)); efl_canvas_object_animation_start(scale_rect2, - efl_new(EFL_CANVAS_ANIMATION_SCALE_CLASS, + efl_new(EFL_CANVAS_SCALE_ANIMATION_CLASS, efl_animation_scale_set(efl_added, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(3.0, 3.0), scale_rect2, EINA_VECTOR2(0.5, 0.5)), efl_animation_duration_set(efl_added, 2.0), efl_animation_play_count_set(efl_added, 0), @@ -136,7 +136,7 @@ main(void) Evas_Object *scale_rect3 = _new_rectangle_add(d.evas); efl_gfx_entity_geometry_set(scale_rect3, EINA_RECT(50, 350, 50, 50)); efl_canvas_object_animation_start(scale_rect3, - efl_new(EFL_CANVAS_ANIMATION_SCALE_CLASS, + efl_new(EFL_CANVAS_SCALE_ANIMATION_CLASS, efl_animation_scale_set(efl_added, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(3.0, 3.0), scale_rect3, EINA_VECTOR2(0.5, 0.5)), efl_animation_duration_set(efl_added, 2.0), efl_animation_play_count_set(efl_added, 4), @@ -147,7 +147,7 @@ main(void) Evas_Object *scale_rect4 = _new_rectangle_add(d.evas); efl_gfx_entity_geometry_set(scale_rect4, EINA_RECT(200, 50, 50, 50)); efl_canvas_object_animation_start(scale_rect4, - efl_new(EFL_CANVAS_ANIMATION_SCALE_CLASS, + efl_new(EFL_CANVAS_SCALE_ANIMATION_CLASS, efl_animation_scale_set(efl_added, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(3.0, 3.0), scale_rect4, EINA_VECTOR2(0.5, 0.5)), efl_animation_duration_set(efl_added, 2.0), efl_animation_final_state_keep_set(efl_added, EINA_TRUE) @@ -159,7 +159,7 @@ main(void) efl_gfx_color_set(scale_rect5, 255, 0, 0, 255); efl_gfx_entity_geometry_set(scale_rect5, EINA_RECT(200, 200, 50, 50)); efl_canvas_object_animation_start(scale_rect5, - efl_new(EFL_CANVAS_ANIMATION_SCALE_CLASS, + efl_new(EFL_CANVAS_SCALE_ANIMATION_CLASS, efl_animation_scale_set(efl_added, EINA_VECTOR2(1.0, 1.0), EINA_VECTOR2(5.0, 5.0), scale_rect5, EINA_VECTOR2(0.5, 0.5)), efl_animation_duration_set(efl_added, 5.0), efl_animation_play_count_set(efl_added, 0) diff --git a/src/lib/elementary/efl_ui_spotlight_manager_stack.c b/src/lib/elementary/efl_ui_spotlight_manager_stack.c index b89a4c6554..26965326a3 100644 --- a/src/lib/elementary/efl_ui_spotlight_manager_stack.c +++ b/src/lib/elementary/efl_ui_spotlight_manager_stack.c @@ -62,7 +62,7 @@ _efl_ui_spotlight_manager_stack_efl_ui_spotlight_manager_bind(Eo *obj, Efl_Ui_Sp { pd->container = spotlight; - pd->alpha_anim = efl_add(EFL_CANVAS_ANIMATION_ALPHA_CLASS, obj); + pd->alpha_anim = efl_add(EFL_CANVAS_ALPHA_ANIMATION_CLASS, obj); efl_animation_alpha_set(pd->alpha_anim, 0.0, 1.0); efl_animation_duration_set(pd->alpha_anim, 0.5); diff --git a/src/lib/evas/Efl_Canvas.h b/src/lib/evas/Efl_Canvas.h index dc3f61a43b..fe18f75353 100644 --- a/src/lib/evas/Efl_Canvas.h +++ b/src/lib/evas/Efl_Canvas.h @@ -64,14 +64,14 @@ extern "C" { #include #include -#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index 7c5efc3f45..b1cecf11ba 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -3371,52 +3371,52 @@ typedef Eo Efl_Animation; #endif -#ifndef _EFL_ANIMATION_ALPHA_EO_CLASS_TYPE -#define _EFL_ANIMATION_ALPHA_EO_CLASS_TYPE +#ifndef _EFL_ALPHA_ANIMATION_EO_CLASS_TYPE +#define _EFL_ALPHA_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Animation_Alpha; +typedef Eo Efl_Alpha_Animation; #endif -#ifndef _EFL_ANIMATION_ROTATE_EO_CLASS_TYPE -#define _EFL_ANIMATION_ROTATE_EO_CLASS_TYPE +#ifndef _EFL_ROTATE_ANIMATION_EO_CLASS_TYPE +#define _EFL_ROTATE_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Animation_Rotate; +typedef Eo Efl_Rotate_Animation; #endif -#ifndef _EFL_ANIMATION_SCALE_EO_CLASS_TYPE -#define _EFL_ANIMATION_SCALE_EO_CLASS_TYPE +#ifndef _EFL_SCALE_ANIMATION_EO_CLASS_TYPE +#define _EFL_SCALE_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Animation_Scale; +typedef Eo Efl_Scale_Animation; #endif -#ifndef _EFL_ANIMATION_TRANSLATE_EO_CLASS_TYPE -#define _EFL_ANIMATION_TRANSLATE_EO_CLASS_TYPE +#ifndef _EFL_TRANSLATE_ANIMATION_EO_CLASS_TYPE +#define _EFL_TRANSLATE_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Animation_Translate; +typedef Eo Efl_Translate_Animation; #endif -#ifndef _EFL_ANIMATION_GROUP_EO_CLASS_TYPE -#define _EFL_ANIMATION_GROUP_EO_CLASS_TYPE +#ifndef _EFL_GROUP_ANIMATION_EO_CLASS_TYPE +#define _EFL_GROUP_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Animation_Group; +typedef Eo Efl_Group_Animation; #endif -#ifndef _EFL_ANIMATION_GROUP_PARALLEL_EO_CLASS_TYPE -#define _EFL_ANIMATION_GROUP_PARALLEL_EO_CLASS_TYPE +#ifndef _EFL_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE +#define _EFL_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Animation_Group_Parallel; +typedef Eo Efl_Parallel_Group_Animation; #endif -#ifndef _EFL_ANIMATION_GROUP_SEQUENTIAL_EO_CLASS_TYPE -#define _EFL_ANIMATION_GROUP_SEQUENTIAL_EO_CLASS_TYPE +#ifndef _EFL_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE +#define _EFL_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Animation_Group_Sequential; +typedef Eo Efl_Sequential_Group_Animation; #endif @@ -3462,17 +3462,17 @@ typedef Eo Efl_Animation_Player_Group; #endif -#ifndef _EFL_ANIMATION_GROUP_PARALLEL_EO_CLASS_TYPE -#define _EFL_ANIMATION_GROUP_PARALLEL_EO_CLASS_TYPE +#ifndef _EFL_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE +#define _EFL_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Animation_Group_Parallel; +typedef Eo Efl_Parallel_Group_Animation; #endif -#ifndef _EFL_ANIMATION_GROUP_SEQUENTIAL_EO_CLASS_TYPE -#define _EFL_ANIMATION_GROUP_SEQUENTIAL_EO_CLASS_TYPE +#ifndef _EFL_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE +#define _EFL_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Animation_Group_Sequential; +typedef Eo Efl_Sequential_Group_Animation; #endif diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index d9cc99932c..356a8fcc53 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -17,52 +17,52 @@ typedef Eo Efl_Canvas_Animation; #endif -#ifndef _EFL_CANVAS_ANIMATION_ALPHA_EO_CLASS_TYPE -#define _EFL_CANVAS_ANIMATION_ALPHA_EO_CLASS_TYPE +#ifndef _EFL_CANVAS_ALPHA_ANIMATION_EO_CLASS_TYPE +#define _EFL_CANVAS_ALPHA_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Canvas_Animation_Alpha; +typedef Eo Efl_Canvas_Alpha_Animation; #endif -#ifndef _EFL_CANVAS_ANIMATION_ROTATE_EO_CLASS_TYPE -#define _EFL_CANVAS_ANIMATION_ROTATE_EO_CLASS_TYPE +#ifndef _EFL_CANVAS_ROTATE_ANIMATION_EO_CLASS_TYPE +#define _EFL_CANVAS_ROTATE_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Canvas_Animation_Rotate; +typedef Eo Efl_Canvas_Rotate_Animation; #endif -#ifndef _EFL_CANVAS_ANIMATION_SCALE_EO_CLASS_TYPE -#define _EFL_CANVAS_ANIMATION_SCALE_EO_CLASS_TYPE +#ifndef _EFL_CANVAS_SCALE_ANIMATION_EO_CLASS_TYPE +#define _EFL_CANVAS_SCALE_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Canvas_Animation_Scale; +typedef Eo Efl_Canvas_Scale_Animation; #endif -#ifndef _EFL_CANVAS_ANIMATION_TRANSLATE_EO_CLASS_TYPE -#define _EFL_CANVAS_ANIMATION_TRANSLATE_EO_CLASS_TYPE +#ifndef _EFL_CANVAS_TRANSLATE_ANIMATION_EO_CLASS_TYPE +#define _EFL_CANVAS_TRANSLATE_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Canvas_Animation_Translate; +typedef Eo Efl_Canvas_Translate_Animation; #endif -#ifndef _EFL_CANVAS_ANIMATION_GROUP_EO_CLASS_TYPE -#define _EFL_CANVAS_ANIMATION_GROUP_EO_CLASS_TYPE +#ifndef _EFL_CANVAS_GROUP_ANIMATION_EO_CLASS_TYPE +#define _EFL_CANVAS_GROUP_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Canvas_Animation_Group; +typedef Eo Efl_Canvas_Group_Animation; #endif -#ifndef _EFL_CANVAS_ANIMATION_GROUP_PARALLEL_EO_CLASS_TYPE -#define _EFL_CANVAS_ANIMATION_GROUP_PARALLEL_EO_CLASS_TYPE +#ifndef _EFL_CANVAS_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE +#define _EFL_CANVAS_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Canvas_Animation_Group_Parallel; +typedef Eo Efl_Canvas_Parallel_Group_Animation; #endif -#ifndef _EFL_CANVAS_ANIMATION_GROUP_SEQUENTIAL_EO_CLASS_TYPE -#define _EFL_CANVAS_ANIMATION_GROUP_SEQUENTIAL_EO_CLASS_TYPE +#ifndef _EFL_CANVAS_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE +#define _EFL_CANVAS_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Canvas_Animation_Group_Sequential; +typedef Eo Efl_Canvas_Sequential_Group_Animation; #endif @@ -108,17 +108,17 @@ typedef Eo Efl_Canvas_Animation_Player_Group; #endif -#ifndef _EFL_CANVAS_ANIMATION_GROUP_PARALLEL_EO_CLASS_TYPE -#define _EFL_CANVAS_ANIMATION_GROUP_PARALLEL_EO_CLASS_TYPE +#ifndef _EFL_CANVAS_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE +#define _EFL_CANVAS_PARALLEL_GROUP_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Canvas_Animation_Group_Parallel; +typedef Eo Efl_Canvas_Parallel_Group_Animation; #endif -#ifndef _EFL_CANVAS_ANIMATION_GROUP_SEQUENTIAL_EO_CLASS_TYPE -#define _EFL_CANVAS_ANIMATION_GROUP_SEQUENTIAL_EO_CLASS_TYPE +#ifndef _EFL_CANVAS_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE +#define _EFL_CANVAS_SEQUENTIAL_GROUP_ANIMATION_EO_CLASS_TYPE -typedef Eo Efl_Canvas_Animation_Group_Sequential; +typedef Eo Efl_Canvas_Sequential_Group_Animation; #endif @@ -219,13 +219,13 @@ struct _Efl_Canvas_Object_Animation_Event #include "canvas/efl_canvas_object.eo.h" #include "canvas/efl_canvas_object_animation.eo.h" #include "canvas/efl_canvas_animation.eo.h" -#include "canvas/efl_canvas_animation_alpha.eo.h" -#include "canvas/efl_canvas_animation_rotate.eo.h" -#include "canvas/efl_canvas_animation_scale.eo.h" -#include "canvas/efl_canvas_animation_translate.eo.h" -#include "canvas/efl_canvas_animation_group.eo.h" -#include "canvas/efl_canvas_animation_group_parallel.eo.h" -#include "canvas/efl_canvas_animation_group_sequential.eo.h" +#include "canvas/efl_canvas_alpha_animation.eo.h" +#include "canvas/efl_canvas_rotate_animation.eo.h" +#include "canvas/efl_canvas_scale_animation.eo.h" +#include "canvas/efl_canvas_translate_animation.eo.h" +#include "canvas/efl_canvas_group_animation.eo.h" +#include "canvas/efl_canvas_parallel_group_animation.eo.h" +#include "canvas/efl_canvas_sequential_group_animation.eo.h" #include "canvas/efl_canvas_event_grabber.eo.h" /** diff --git a/src/lib/evas/canvas/efl_canvas_animation_alpha.c b/src/lib/evas/canvas/efl_canvas_alpha_animation.c similarity index 64% rename from src/lib/evas/canvas/efl_canvas_animation_alpha.c rename to src/lib/evas/canvas/efl_canvas_alpha_animation.c index c0bca11101..913a826a04 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_alpha.c +++ b/src/lib/evas/canvas/efl_canvas_alpha_animation.c @@ -1,10 +1,10 @@ -#include "efl_canvas_animation_alpha_private.h" +#include "efl_canvas_alpha_animation_private.h" -#define MY_CLASS EFL_CANVAS_ANIMATION_ALPHA_CLASS +#define MY_CLASS EFL_CANVAS_ALPHA_ANIMATION_CLASS EOLIAN static void -_efl_canvas_animation_alpha_alpha_set(Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Animation_Alpha_Data *pd, +_efl_canvas_alpha_animation_alpha_set(Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Alpha_Animation_Data *pd, double from_alpha, double to_alpha) { @@ -13,8 +13,8 @@ _efl_canvas_animation_alpha_alpha_set(Eo *eo_obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_animation_alpha_alpha_get(const Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Animation_Alpha_Data *pd, +_efl_canvas_alpha_animation_alpha_get(const Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Alpha_Animation_Data *pd, double *from_alpha, double *to_alpha) { @@ -26,8 +26,8 @@ _efl_canvas_animation_alpha_alpha_get(const Eo *eo_obj EINA_UNUSED, EOLIAN static double -_efl_canvas_animation_alpha_efl_canvas_animation_animation_apply(Eo *eo_obj, - Efl_Canvas_Animation_Alpha_Data *pd EINA_UNUSED, +_efl_canvas_alpha_animation_efl_canvas_animation_animation_apply(Eo *eo_obj, + Efl_Canvas_Alpha_Animation_Data *pd EINA_UNUSED, double progress, Efl_Canvas_Object *target) { @@ -50,8 +50,8 @@ _efl_canvas_animation_alpha_efl_canvas_animation_animation_apply(Eo *eo_obj, } EOLIAN static Efl_Object * -_efl_canvas_animation_alpha_efl_object_constructor(Eo *eo_obj, - Efl_Canvas_Animation_Alpha_Data *pd) +_efl_canvas_alpha_animation_efl_object_constructor(Eo *eo_obj, + Efl_Canvas_Alpha_Animation_Data *pd) { eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); @@ -61,4 +61,4 @@ _efl_canvas_animation_alpha_efl_object_constructor(Eo *eo_obj, return eo_obj; } -#include "efl_canvas_animation_alpha.eo.c" +#include "efl_canvas_alpha_animation.eo.c" diff --git a/src/lib/evas/canvas/efl_canvas_animation_alpha.eo b/src/lib/evas/canvas/efl_canvas_alpha_animation.eo similarity index 87% rename from src/lib/evas/canvas/efl_canvas_animation_alpha.eo rename to src/lib/evas/canvas/efl_canvas_alpha_animation.eo index d0b18f4afc..f466c00e79 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_alpha.eo +++ b/src/lib/evas/canvas/efl_canvas_alpha_animation.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Animation_Alpha extends Efl.Canvas.Animation +class Efl.Canvas.Alpha_Animation extends Efl.Canvas.Animation { [[Animated alpha blending effect. @@ -9,7 +9,7 @@ class Efl.Canvas.Animation_Alpha extends Efl.Canvas.Animation @since 1.24 ]] c_prefix: efl_animation_alpha; - data: Efl_Canvas_Animation_Alpha_Data; + data: Efl_Canvas_Alpha_Animation_Data; methods { @property alpha { [[Alpha range to animate. $[0.0] means the object is transparent and $[1.0] means diff --git a/src/lib/evas/canvas/efl_canvas_alpha_animation_private.h b/src/lib/evas/canvas/efl_canvas_alpha_animation_private.h new file mode 100644 index 0000000000..d167f458f7 --- /dev/null +++ b/src/lib/evas/canvas/efl_canvas_alpha_animation_private.h @@ -0,0 +1,19 @@ +#define EFL_ANIMATION_PROTECTED + +#include "evas_common_private.h" +#include +#include "efl_canvas_animation_private.h" + +#define EFL_ALPHA_ANIMATION_DATA_GET(o, pd) \ + Efl_Canvas_Alpha_Animation_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ALPHA_ANIMATION_CLASS) + +typedef struct _Efl_Canvas_Alpha_Animation_Property +{ + double alpha; +} Efl_Canvas_Alpha_Animation_Property; + +typedef struct _Efl_Canvas_Alpha_Animation_Data +{ + Efl_Canvas_Alpha_Animation_Property from; + Efl_Canvas_Alpha_Animation_Property to; +} Efl_Canvas_Alpha_Animation_Data; diff --git a/src/lib/evas/canvas/efl_canvas_animation.eo b/src/lib/evas/canvas/efl_canvas_animation.eo index 665b3b509e..b7bcb0452f 100644 --- a/src/lib/evas/canvas/efl_canvas_animation.eo +++ b/src/lib/evas/canvas/efl_canvas_animation.eo @@ -9,7 +9,7 @@ class Efl.Canvas.Animation extends Efl.Object implements Efl.Playable The value of the changed properties moves smoothly as the provided progress value evolves from $[0] to $[1]. - For example implementations see @Efl.Canvas.Animation_Translate or @Efl.Canvas.Animation_Scale. + For example implementations see @Efl.Canvas.Translate_Animation or @Efl.Canvas.Scale_Animation. Note: Unless @.final_state_keep is used, when an animation finishes any effect it introduced on the object is removed. This means that if the animation does not end in the object's initial state there will be a noticeable @@ -103,7 +103,7 @@ class Efl.Canvas.Animation extends Efl.Object implements Efl.Playable animation_apply { [[Overwrite this method to implement your own animation subclasses. - This is used for example by @Efl.Canvas.Animation_Translate or @Efl.Canvas.Animation_Scale. + This is used for example by @Efl.Canvas.Translate_Animation or @Efl.Canvas.Scale_Animation. Subclasses should call their parent's @.animation_apply to get the adjusted $progress value and then perform the animation by modifying the $target's properties. diff --git a/src/lib/evas/canvas/efl_canvas_animation_alpha_private.h b/src/lib/evas/canvas/efl_canvas_animation_alpha_private.h deleted file mode 100644 index fc0b9e655f..0000000000 --- a/src/lib/evas/canvas/efl_canvas_animation_alpha_private.h +++ /dev/null @@ -1,19 +0,0 @@ -#define EFL_ANIMATION_PROTECTED - -#include "evas_common_private.h" -#include -#include "efl_canvas_animation_private.h" - -#define EFL_ANIMATION_ALPHA_DATA_GET(o, pd) \ - Efl_Canvas_Animation_Alpha_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ANIMATION_ALPHA_CLASS) - -typedef struct _Efl_Canvas_Animation_Alpha_Property -{ - double alpha; -} Efl_Canvas_Animation_Alpha_Property; - -typedef struct _Efl_Canvas_Animation_Alpha_Data -{ - Efl_Canvas_Animation_Alpha_Property from; - Efl_Canvas_Animation_Alpha_Property to; -} Efl_Canvas_Animation_Alpha_Data; diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_private.h b/src/lib/evas/canvas/efl_canvas_animation_group_private.h deleted file mode 100644 index 335053d9c1..0000000000 --- a/src/lib/evas/canvas/efl_canvas_animation_group_private.h +++ /dev/null @@ -1,16 +0,0 @@ -#define EFL_ANIMATION_PROTECTED - -#include "evas_common_private.h" -#include - -#define MY_CLASS EFL_CANVAS_ANIMATION_GROUP_CLASS -#define MY_CLASS_NAME efl_class_name_get(MY_CLASS) - -#define EFL_ANIMATION_GROUP_DATA_GET(o, pd) \ - Efl_Canvas_Animation_Group_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ANIMATION_GROUP_CLASS) - -typedef struct _Efl_Canvas_Animation_Group_Data -{ - Eina_List *animations; - Eina_Bool is_duration_set : 1; //EINA_TRUE if duration is set -} Efl_Canvas_Animation_Group_Data; diff --git a/src/lib/evas/canvas/efl_canvas_animation_rotate_private.h b/src/lib/evas/canvas/efl_canvas_animation_rotate_private.h deleted file mode 100644 index 64c5887959..0000000000 --- a/src/lib/evas/canvas/efl_canvas_animation_rotate_private.h +++ /dev/null @@ -1,30 +0,0 @@ -#define EFL_ANIMATION_PROTECTED - -#include "evas_common_private.h" -#include -#include "efl_canvas_animation_private.h" - -#define EFL_ANIMATION_ROTATE_DATA_GET(o, pd) \ - Efl_Canvas_Animation_Rotate_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ANIMATION_ROTATE_CLASS) - -typedef struct _Efl_Canvas_Animation_Rotate_Property -{ - double degree; -} Efl_Canvas_Animation_Rotate_Property; - -typedef struct _Efl_Canvas_Animation_Rotate_Relative_Pivot -{ - Efl_Canvas_Object *obj; - Eina_Vector2 pos; -} Efl_Canvas_Animation_Rotate_Relative_Pivot; - -typedef struct _Efl_Canvas_Animation_Rotate_Data -{ - Efl_Canvas_Animation_Rotate_Property from; - Efl_Canvas_Animation_Rotate_Property to; - - Eina_Position2D abs_pivot; - Efl_Canvas_Animation_Rotate_Relative_Pivot rel_pivot; - - Eina_Bool use_rel_pivot; -} Efl_Canvas_Animation_Rotate_Data; diff --git a/src/lib/evas/canvas/efl_canvas_animation_scale_private.h b/src/lib/evas/canvas/efl_canvas_animation_scale_private.h deleted file mode 100644 index 57dc40d725..0000000000 --- a/src/lib/evas/canvas/efl_canvas_animation_scale_private.h +++ /dev/null @@ -1,25 +0,0 @@ -#define EFL_ANIMATION_PROTECTED - -#include "evas_common_private.h" -#include -#include "efl_canvas_animation_private.h" - -#define EFL_ANIMATION_SCALE_DATA_GET(o, pd) \ - Efl_Canvas_Animation_Scale_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ANIMATION_SCALE_CLASS) - -typedef struct _Efl_Canvas_Animation_Scale_Relative_Pivot -{ - Efl_Canvas_Object *obj; - Eina_Vector2 pos; -} Efl_Canvas_Animation_Scale_Relative_Pivot; - -typedef struct _Efl_Canvas_Animation_Scale_Data -{ - Eina_Vector2 from; - Eina_Vector2 to; - - Eina_Position2D pos; - Efl_Canvas_Animation_Scale_Relative_Pivot rel_pivot; - - Eina_Bool use_rel_pivot; -} Efl_Canvas_Animation_Scale_Data; diff --git a/src/lib/evas/canvas/efl_canvas_animation_translate_private.h b/src/lib/evas/canvas/efl_canvas_animation_translate_private.h deleted file mode 100644 index 47665a5984..0000000000 --- a/src/lib/evas/canvas/efl_canvas_animation_translate_private.h +++ /dev/null @@ -1,16 +0,0 @@ -#define EFL_ANIMATION_PROTECTED - -#include "evas_common_private.h" -#include -#include "efl_canvas_animation_private.h" - -#define EFL_ANIMATION_TRANSLATE_DATA_GET(o, pd) \ - Efl_Canvas_Animation_Translate_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ANIMATION_TRANSLATE_CLASS) - -typedef struct _Efl_Canvas_Animation_Translate_Data -{ - Eina_Position2D from; - Eina_Position2D to; - - Eina_Bool use_rel_move; -} Efl_Canvas_Animation_Translate_Data; diff --git a/src/lib/evas/canvas/efl_canvas_animation_group.c b/src/lib/evas/canvas/efl_canvas_group_animation.c similarity index 71% rename from src/lib/evas/canvas/efl_canvas_animation_group.c rename to src/lib/evas/canvas/efl_canvas_group_animation.c index 7dc7c24bb8..f2e068c8d1 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_group.c +++ b/src/lib/evas/canvas/efl_canvas_group_animation.c @@ -1,8 +1,8 @@ -#include "efl_canvas_animation_group_private.h" +#include "efl_canvas_group_animation_private.h" EOLIAN static void -_efl_canvas_animation_group_animation_add(Eo *eo_obj, - Efl_Canvas_Animation_Group_Data *pd, +_efl_canvas_group_animation_animation_add(Eo *eo_obj, + Efl_Canvas_Group_Animation_Data *pd, Efl_Canvas_Animation *animation) { if (!animation) return; @@ -24,8 +24,8 @@ _efl_canvas_animation_group_animation_add(Eo *eo_obj, } EOLIAN static void -_efl_canvas_animation_group_animation_del(Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Animation_Group_Data *pd, +_efl_canvas_group_animation_animation_del(Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Group_Animation_Data *pd, Efl_Canvas_Animation *animation) { Eina_List *list; @@ -45,15 +45,15 @@ _efl_canvas_animation_group_animation_del(Eo *eo_obj EINA_UNUSED, } EOLIAN static Eina_Iterator* -_efl_canvas_animation_group_animations_get(const Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Animation_Group_Data *pd) +_efl_canvas_group_animation_animations_get(const Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Group_Animation_Data *pd) { return eina_list_iterator_new(pd->animations); } EOLIAN static void -_efl_canvas_animation_group_efl_canvas_animation_duration_set(Eo *eo_obj, - Efl_Canvas_Animation_Group_Data *pd, +_efl_canvas_group_animation_efl_canvas_animation_duration_set(Eo *eo_obj, + Efl_Canvas_Group_Animation_Data *pd, double duration) { EINA_SAFETY_ON_FALSE_RETURN(duration >= 0.0); @@ -72,8 +72,8 @@ _efl_canvas_animation_group_efl_canvas_animation_duration_set(Eo *eo_obj, } EOLIAN static void -_efl_canvas_animation_group_efl_canvas_animation_final_state_keep_set(Eo *eo_obj, - Efl_Canvas_Animation_Group_Data *pd, +_efl_canvas_group_animation_efl_canvas_animation_final_state_keep_set(Eo *eo_obj, + Efl_Canvas_Group_Animation_Data *pd, Eina_Bool keep_final_state) { Eina_List *l; @@ -87,8 +87,8 @@ _efl_canvas_animation_group_efl_canvas_animation_final_state_keep_set(Eo *eo_obj } EOLIAN static void -_efl_canvas_animation_group_efl_canvas_animation_interpolator_set(Eo *eo_obj, - Efl_Canvas_Animation_Group_Data *pd, +_efl_canvas_group_animation_efl_canvas_animation_interpolator_set(Eo *eo_obj, + Efl_Canvas_Group_Animation_Data *pd, Efl_Interpolator *interpolator) { Eina_List *l; @@ -102,8 +102,8 @@ _efl_canvas_animation_group_efl_canvas_animation_interpolator_set(Eo *eo_obj, } EOLIAN static Efl_Object * -_efl_canvas_animation_group_efl_object_constructor(Eo *eo_obj, - Efl_Canvas_Animation_Group_Data *pd) +_efl_canvas_group_animation_efl_object_constructor(Eo *eo_obj, + Efl_Canvas_Group_Animation_Data *pd) { eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); pd->animations = NULL; @@ -112,8 +112,8 @@ _efl_canvas_animation_group_efl_object_constructor(Eo *eo_obj, } EOLIAN static void -_efl_canvas_animation_group_efl_object_destructor(Eo *eo_obj, - Efl_Canvas_Animation_Group_Data *pd) +_efl_canvas_group_animation_efl_object_destructor(Eo *eo_obj, + Efl_Canvas_Group_Animation_Data *pd) { Efl_Canvas_Animation *anim; @@ -123,4 +123,4 @@ _efl_canvas_animation_group_efl_object_destructor(Eo *eo_obj, efl_destructor(efl_super(eo_obj, MY_CLASS)); } -#include "efl_canvas_animation_group.eo.c" +#include "efl_canvas_group_animation.eo.c" diff --git a/src/lib/evas/canvas/efl_canvas_animation_group.eo b/src/lib/evas/canvas/efl_canvas_group_animation.eo similarity index 85% rename from src/lib/evas/canvas/efl_canvas_animation_group.eo rename to src/lib/evas/canvas/efl_canvas_group_animation.eo index b4fe40a294..65d2fbd12f 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_group.eo +++ b/src/lib/evas/canvas/efl_canvas_group_animation.eo @@ -1,15 +1,15 @@ -abstract Efl.Canvas.Animation_Group extends Efl.Canvas.Animation +abstract Efl.Canvas.Group_Animation extends Efl.Canvas.Animation { [[Base class for combined animations (groups of animations that are played together). This class provides methods to add, remove and retrieve individual animations from the group. - See for example @Efl.Canvas.Animation_Group_Parallel and @Efl.Canvas.Animation_Group_Sequential. + See for example @Efl.Canvas.Parallel_Group_Animation and @Efl.Canvas.Sequential_Group_Animation. @since 1.24 ]] c_prefix: efl_animation_group; - data: Efl_Canvas_Animation_Group_Data; + data: Efl_Canvas_Group_Animation_Data; methods { animation_add { [[Adds the given animation to the animation group.]] diff --git a/src/lib/evas/canvas/efl_canvas_group_animation_private.h b/src/lib/evas/canvas/efl_canvas_group_animation_private.h new file mode 100644 index 0000000000..38b7804533 --- /dev/null +++ b/src/lib/evas/canvas/efl_canvas_group_animation_private.h @@ -0,0 +1,16 @@ +#define EFL_ANIMATION_PROTECTED + +#include "evas_common_private.h" +#include + +#define MY_CLASS EFL_CANVAS_GROUP_ANIMATION_CLASS +#define MY_CLASS_NAME efl_class_name_get(MY_CLASS) + +#define EFL_GROUP_ANIMATION_DATA_GET(o, pd) \ + Efl_Canvas_Group_Animation_Data *pd = efl_data_scope_get(o, EFL_CANVAS_GROUP_ANIMATION_CLASS) + +typedef struct _Efl_Canvas_Group_Animation_Data +{ + Eina_List *animations; + Eina_Bool is_duration_set : 1; //EINA_TRUE if duration is set +} Efl_Canvas_Group_Animation_Data; diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_parallel.c b/src/lib/evas/canvas/efl_canvas_parallel_group_animation.c similarity index 89% rename from src/lib/evas/canvas/efl_canvas_animation_group_parallel.c rename to src/lib/evas/canvas/efl_canvas_parallel_group_animation.c index 9960e4105e..3d811fb738 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_group_parallel.c +++ b/src/lib/evas/canvas/efl_canvas_parallel_group_animation.c @@ -1,9 +1,9 @@ -#include "efl_canvas_animation_group_parallel_private.h" +#include "efl_canvas_parallel_group_animation_private.h" -#define MY_CLASS EFL_CANVAS_ANIMATION_GROUP_PARALLEL_CLASS +#define MY_CLASS EFL_CANVAS_PARALLEL_GROUP_ANIMATION_CLASS EOLIAN static double -_efl_canvas_animation_group_parallel_efl_canvas_animation_animation_apply(Eo *eo_obj, +_efl_canvas_parallel_group_animation_efl_canvas_animation_animation_apply(Eo *eo_obj, void *_pd EINA_UNUSED, double progress, Efl_Canvas_Object *target) @@ -53,7 +53,7 @@ _efl_canvas_animation_group_parallel_efl_canvas_animation_animation_apply(Eo *eo } EOLIAN static double -_efl_canvas_animation_group_parallel_efl_canvas_animation_duration_get(const Eo *eo_obj, void *_pd EINA_UNUSED) +_efl_canvas_parallel_group_animation_efl_canvas_animation_duration_get(const Eo *eo_obj, void *_pd EINA_UNUSED) { double child_total_duration; double total_duration = 0.0; @@ -74,4 +74,4 @@ _efl_canvas_animation_group_parallel_efl_canvas_animation_duration_get(const Eo return total_duration; } -#include "efl_canvas_animation_group_parallel.eo.c" +#include "efl_canvas_parallel_group_animation.eo.c" diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo b/src/lib/evas/canvas/efl_canvas_parallel_group_animation.eo similarity index 70% rename from src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo rename to src/lib/evas/canvas/efl_canvas_parallel_group_animation.eo index e109a00baa..9f38769f66 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo +++ b/src/lib/evas/canvas/efl_canvas_parallel_group_animation.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Animation_Group_Parallel extends Efl.Canvas.Animation_Group +class Efl.Canvas.Parallel_Group_Animation extends Efl.Canvas.Group_Animation { [[Combined animation which plays its individual animations in parallel (all of them simultaneously). @@ -6,11 +6,10 @@ class Efl.Canvas.Animation_Group_Parallel extends Efl.Canvas.Animation_Group For instance, this could be used to move an @Efl.Canvas.Object from one position to another while rotating it along the way. - Use @Efl.Canvas.Animation_Group.animation_add to append individual animations. + Use @Efl.Canvas.Group_Animation.animation_add to append individual animations. @since 1.24 ]] - c_prefix: efl_animation_group_parallel; data: null; methods { } diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_parallel_private.h b/src/lib/evas/canvas/efl_canvas_parallel_group_animation_private.h similarity index 100% rename from src/lib/evas/canvas/efl_canvas_animation_group_parallel_private.h rename to src/lib/evas/canvas/efl_canvas_parallel_group_animation_private.h diff --git a/src/lib/evas/canvas/efl_canvas_animation_rotate.c b/src/lib/evas/canvas/efl_canvas_rotate_animation.c similarity index 75% rename from src/lib/evas/canvas/efl_canvas_animation_rotate.c rename to src/lib/evas/canvas/efl_canvas_rotate_animation.c index ba07733275..4fb029dd37 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_rotate.c +++ b/src/lib/evas/canvas/efl_canvas_rotate_animation.c @@ -1,10 +1,10 @@ -#include "efl_canvas_animation_rotate_private.h" +#include "efl_canvas_rotate_animation_private.h" -#define MY_CLASS EFL_CANVAS_ANIMATION_ROTATE_CLASS +#define MY_CLASS EFL_CANVAS_ROTATE_ANIMATION_CLASS EOLIAN static void -_efl_canvas_animation_rotate_rotate_set(Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Animation_Rotate_Data *pd, +_efl_canvas_rotate_animation_rotate_set(Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Rotate_Animation_Data *pd, double from_degree, double to_degree, Efl_Canvas_Object *pivot, @@ -20,8 +20,8 @@ _efl_canvas_animation_rotate_rotate_set(Eo *eo_obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_animation_rotate_rotate_get(const Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Animation_Rotate_Data *pd, +_efl_canvas_rotate_animation_rotate_get(const Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Rotate_Animation_Data *pd, double *from_degree, double *to_degree, Efl_Canvas_Object **pivot, @@ -47,8 +47,8 @@ _efl_canvas_animation_rotate_rotate_get(const Eo *eo_obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_animation_rotate_rotate_absolute_set(Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Animation_Rotate_Data *pd, +_efl_canvas_rotate_animation_rotate_absolute_set(Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Rotate_Animation_Data *pd, double from_degree, double to_degree, Eina_Position2D abs) @@ -61,8 +61,8 @@ _efl_canvas_animation_rotate_rotate_absolute_set(Eo *eo_obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_animation_rotate_rotate_absolute_get(const Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Animation_Rotate_Data *pd, +_efl_canvas_rotate_animation_rotate_absolute_get(const Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Rotate_Animation_Data *pd, double *from_degree, double *to_degree, Eina_Position2D *abs) @@ -84,8 +84,8 @@ _efl_canvas_animation_rotate_rotate_absolute_get(const Eo *eo_obj EINA_UNUSED, } EOLIAN static double -_efl_canvas_animation_rotate_efl_canvas_animation_animation_apply(Eo *eo_obj, - Efl_Canvas_Animation_Rotate_Data *pd, +_efl_canvas_rotate_animation_efl_canvas_animation_animation_apply(Eo *eo_obj, + Efl_Canvas_Rotate_Animation_Data *pd, double progress, Efl_Canvas_Object *target) { @@ -114,8 +114,8 @@ _efl_canvas_animation_rotate_efl_canvas_animation_animation_apply(Eo *eo_obj, } EOLIAN static Efl_Object * -_efl_canvas_animation_rotate_efl_object_constructor(Eo *eo_obj, - Efl_Canvas_Animation_Rotate_Data *pd) +_efl_canvas_rotate_animation_efl_object_constructor(Eo *eo_obj, + Efl_Canvas_Rotate_Animation_Data *pd) { eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); @@ -134,4 +134,4 @@ _efl_canvas_animation_rotate_efl_object_constructor(Eo *eo_obj, return eo_obj; } -#include "efl_canvas_animation_rotate.eo.c" +#include "efl_canvas_rotate_animation.eo.c" diff --git a/src/lib/evas/canvas/efl_canvas_animation_rotate.eo b/src/lib/evas/canvas/efl_canvas_rotate_animation.eo similarity index 94% rename from src/lib/evas/canvas/efl_canvas_animation_rotate.eo rename to src/lib/evas/canvas/efl_canvas_rotate_animation.eo index c81f6eeaea..aa79e28a2f 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_rotate.eo +++ b/src/lib/evas/canvas/efl_canvas_rotate_animation.eo @@ -1,4 +1,6 @@ -class Efl.Canvas.Animation_Rotate extends Efl.Canvas.Animation +import eina_types; + +class Efl.Canvas.Rotate_Animation extends Efl.Canvas.Animation { [[Animated rotation effect. @@ -12,7 +14,7 @@ class Efl.Canvas.Animation_Rotate extends Efl.Canvas.Animation @since 1.24 ]] c_prefix: efl_animation_rotate; - data: Efl_Canvas_Animation_Rotate_Data; + data: Efl_Canvas_Rotate_Animation_Data; methods { @property rotate { [[Degree range to animate and pivot object. diff --git a/src/lib/evas/canvas/efl_canvas_rotate_animation_private.h b/src/lib/evas/canvas/efl_canvas_rotate_animation_private.h new file mode 100644 index 0000000000..459997cf77 --- /dev/null +++ b/src/lib/evas/canvas/efl_canvas_rotate_animation_private.h @@ -0,0 +1,30 @@ +#define EFL_ANIMATION_PROTECTED + +#include "evas_common_private.h" +#include +#include "efl_canvas_animation_private.h" + +#define EFL_ROTATE_ANIMATION_DATA_GET(o, pd) \ + Efl_Canvas_Rotate_Animation_Data *pd = efl_data_scope_get(o, EFL_CANVAS_ROTATE_ANIMATION_CLASS) + +typedef struct _Efl_Canvas_Rotate_Animation_Property +{ + double degree; +} Efl_Canvas_Rotate_Animation_Property; + +typedef struct _Efl_Canvas_Rotate_Animation_Relative_Pivot +{ + Efl_Canvas_Object *obj; + Eina_Vector2 pos; +} Efl_Canvas_Rotate_Animation_Relative_Pivot; + +typedef struct _Efl_Canvas_Rotate_Animation_Data +{ + Efl_Canvas_Rotate_Animation_Property from; + Efl_Canvas_Rotate_Animation_Property to; + + Eina_Position2D abs_pivot; + Efl_Canvas_Rotate_Animation_Relative_Pivot rel_pivot; + + Eina_Bool use_rel_pivot; +} Efl_Canvas_Rotate_Animation_Data; diff --git a/src/lib/evas/canvas/efl_canvas_animation_scale.c b/src/lib/evas/canvas/efl_canvas_scale_animation.c similarity index 75% rename from src/lib/evas/canvas/efl_canvas_animation_scale.c rename to src/lib/evas/canvas/efl_canvas_scale_animation.c index e8a13233d6..68abf64b2b 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_scale.c +++ b/src/lib/evas/canvas/efl_canvas_scale_animation.c @@ -1,10 +1,10 @@ -#include "efl_canvas_animation_scale_private.h" +#include "efl_canvas_scale_animation_private.h" -#define MY_CLASS EFL_CANVAS_ANIMATION_SCALE_CLASS +#define MY_CLASS EFL_CANVAS_SCALE_ANIMATION_CLASS EOLIAN static void -_efl_canvas_animation_scale_scale_set(Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Animation_Scale_Data *pd, +_efl_canvas_scale_animation_scale_set(Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Scale_Animation_Data *pd, Eina_Vector2 from_scale, Eina_Vector2 to_scale, Efl_Canvas_Object *pivot, @@ -21,8 +21,8 @@ _efl_canvas_animation_scale_scale_set(Eo *eo_obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_animation_scale_scale_get(const Eo *obj EINA_UNUSED, - Efl_Canvas_Animation_Scale_Data *pd, +_efl_canvas_scale_animation_scale_get(const Eo *obj EINA_UNUSED, + Efl_Canvas_Scale_Animation_Data *pd, Eina_Vector2 *from_scale, Eina_Vector2 *to_scale, Efl_Canvas_Object **pivot, Eina_Vector2 *pivot_pos) { @@ -46,8 +46,8 @@ _efl_canvas_animation_scale_scale_get(const Eo *obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_animation_scale_scale_absolute_set(Eo *obj EINA_UNUSED, - Efl_Canvas_Animation_Scale_Data *pd, +_efl_canvas_scale_animation_scale_absolute_set(Eo *obj EINA_UNUSED, + Efl_Canvas_Scale_Animation_Data *pd, Eina_Vector2 from_scale, Eina_Vector2 to_scale, Eina_Position2D pos) { @@ -61,8 +61,8 @@ _efl_canvas_animation_scale_scale_absolute_set(Eo *obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_animation_scale_scale_absolute_get(const Eo *obj EINA_UNUSED, - Efl_Canvas_Animation_Scale_Data *pd, +_efl_canvas_scale_animation_scale_absolute_get(const Eo *obj EINA_UNUSED, + Efl_Canvas_Scale_Animation_Data *pd, Eina_Vector2 *from_scale, Eina_Vector2 *to_scale, Eina_Position2D *pos) { @@ -83,8 +83,8 @@ _efl_canvas_animation_scale_scale_absolute_get(const Eo *obj EINA_UNUSED, } EOLIAN static double -_efl_canvas_animation_scale_efl_canvas_animation_animation_apply(Eo *eo_obj, - Efl_Canvas_Animation_Scale_Data *pd, +_efl_canvas_scale_animation_efl_canvas_animation_animation_apply(Eo *eo_obj, + Efl_Canvas_Scale_Animation_Data *pd, double progress, Efl_Canvas_Object *target) { @@ -114,8 +114,8 @@ _efl_canvas_animation_scale_efl_canvas_animation_animation_apply(Eo *eo_obj, } EOLIAN static Efl_Object * -_efl_canvas_animation_scale_efl_object_constructor(Eo *eo_obj, - Efl_Canvas_Animation_Scale_Data *pd) +_efl_canvas_scale_animation_efl_object_constructor(Eo *eo_obj, + Efl_Canvas_Scale_Animation_Data *pd) { eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); @@ -130,4 +130,4 @@ _efl_canvas_animation_scale_efl_object_constructor(Eo *eo_obj, return eo_obj; } -#include "efl_canvas_animation_scale.eo.c" +#include "efl_canvas_scale_animation.eo.c" diff --git a/src/lib/evas/canvas/efl_canvas_animation_scale.eo b/src/lib/evas/canvas/efl_canvas_scale_animation.eo similarity index 95% rename from src/lib/evas/canvas/efl_canvas_animation_scale.eo rename to src/lib/evas/canvas/efl_canvas_scale_animation.eo index 1bde1a07f6..d0b890a2f4 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_scale.eo +++ b/src/lib/evas/canvas/efl_canvas_scale_animation.eo @@ -1,4 +1,6 @@ -class Efl.Canvas.Animation_Scale extends Efl.Canvas.Animation +import eina_types; + +class Efl.Canvas.Scale_Animation extends Efl.Canvas.Animation { [[Animated scaling effect. @@ -13,7 +15,7 @@ class Efl.Canvas.Animation_Scale extends Efl.Canvas.Animation @since 1.24 ]] c_prefix: efl_animation_scale; - data: Efl_Canvas_Animation_Scale_Data; + data: Efl_Canvas_Scale_Animation_Data; methods { @property scale { [[Scale range and pivot object. diff --git a/src/lib/evas/canvas/efl_canvas_scale_animation_private.h b/src/lib/evas/canvas/efl_canvas_scale_animation_private.h new file mode 100644 index 0000000000..85363ba490 --- /dev/null +++ b/src/lib/evas/canvas/efl_canvas_scale_animation_private.h @@ -0,0 +1,25 @@ +#define EFL_ANIMATION_PROTECTED + +#include "evas_common_private.h" +#include +#include "efl_canvas_animation_private.h" + +#define EFL_SCALE_ANIMATION_DATA_GET(o, pd) \ + Efl_Canvas_Scale_Animation_Data *pd = efl_data_scope_get(o, EFL_CANVAS_SCALE_ANIMATION_CLASS) + +typedef struct _Efl_Canvas_Scale_Animation_Relative_Pivot +{ + Efl_Canvas_Object *obj; + Eina_Vector2 pos; +} Efl_Canvas_Scale_Animation_Relative_Pivot; + +typedef struct _Efl_Canvas_Scale_Animation_Data +{ + Eina_Vector2 from; + Eina_Vector2 to; + + Eina_Position2D pos; + Efl_Canvas_Scale_Animation_Relative_Pivot rel_pivot; + + Eina_Bool use_rel_pivot; +} Efl_Canvas_Scale_Animation_Data; diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_sequential.c b/src/lib/evas/canvas/efl_canvas_sequential_group_animation.c similarity index 90% rename from src/lib/evas/canvas/efl_canvas_animation_group_sequential.c rename to src/lib/evas/canvas/efl_canvas_sequential_group_animation.c index 26edb21355..16234471ae 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_group_sequential.c +++ b/src/lib/evas/canvas/efl_canvas_sequential_group_animation.c @@ -1,9 +1,9 @@ -#include "efl_canvas_animation_group_sequential_private.h" +#include "efl_canvas_sequential_group_animation_private.h" -#define MY_CLASS EFL_CANVAS_ANIMATION_GROUP_SEQUENTIAL_CLASS +#define MY_CLASS EFL_CANVAS_SEQUENTIAL_GROUP_ANIMATION_CLASS EOLIAN static double -_efl_canvas_animation_group_sequential_efl_canvas_animation_animation_apply(Eo *eo_obj, +_efl_canvas_sequential_group_animation_efl_canvas_animation_animation_apply(Eo *eo_obj, void *_pd EINA_UNUSED, double progress, Efl_Canvas_Object *target) @@ -58,7 +58,7 @@ _efl_canvas_animation_group_sequential_efl_canvas_animation_animation_apply(Eo * } EOLIAN static double -_efl_canvas_animation_group_sequential_efl_canvas_animation_duration_get(const Eo *eo_obj, void *_pd EINA_UNUSED) +_efl_canvas_sequential_group_animation_efl_canvas_animation_duration_get(const Eo *eo_obj, void *_pd EINA_UNUSED) { double total_duration = 0.0; double child_total_duration; @@ -78,4 +78,4 @@ _efl_canvas_animation_group_sequential_efl_canvas_animation_duration_get(const E return total_duration; } -#include "efl_canvas_animation_group_sequential.eo.c" +#include "efl_canvas_sequential_group_animation.eo.c" diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo b/src/lib/evas/canvas/efl_canvas_sequential_group_animation.eo similarity index 78% rename from src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo rename to src/lib/evas/canvas/efl_canvas_sequential_group_animation.eo index 09f9e2178e..01417b4b41 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo +++ b/src/lib/evas/canvas/efl_canvas_sequential_group_animation.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Animation_Group_Sequential extends Efl.Canvas.Animation_Group +class Efl.Canvas.Sequential_Group_Animation extends Efl.Canvas.Group_Animation { [[Combined animation which plays its individual animations in a sequential order (one after the other). @@ -6,7 +6,7 @@ class Efl.Canvas.Animation_Group_Sequential extends Efl.Canvas.Animation_Group For instance, this could be used to move an @Efl.Canvas.Object from one position to another and then start rotating it once it reaches its destination. - Use @Efl.Canvas.Animation_Group.animation_add to append individual animations. + Use @Efl.Canvas.Group_Animation.animation_add to append individual animations. Animations are played in the order in which they are added. @since 1.24 diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_sequential_private.h b/src/lib/evas/canvas/efl_canvas_sequential_group_animation_private.h similarity index 100% rename from src/lib/evas/canvas/efl_canvas_animation_group_sequential_private.h rename to src/lib/evas/canvas/efl_canvas_sequential_group_animation_private.h diff --git a/src/lib/evas/canvas/efl_canvas_animation_translate.c b/src/lib/evas/canvas/efl_canvas_translate_animation.c similarity index 70% rename from src/lib/evas/canvas/efl_canvas_animation_translate.c rename to src/lib/evas/canvas/efl_canvas_translate_animation.c index 1a98daa60d..51e22d5446 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_translate.c +++ b/src/lib/evas/canvas/efl_canvas_translate_animation.c @@ -1,6 +1,6 @@ -#include "efl_canvas_animation_translate_private.h" +#include "efl_canvas_translate_animation_private.h" -#define MY_CLASS EFL_CANVAS_ANIMATION_TRANSLATE_CLASS +#define MY_CLASS EFL_CANVAS_TRANSLATE_ANIMATION_CLASS typedef struct __Translate_Property_Double { @@ -9,8 +9,8 @@ typedef struct __Translate_Property_Double } _Translate_Property_Double; EOLIAN static void -_efl_canvas_animation_translate_translate_set(Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Animation_Translate_Data *pd, +_efl_canvas_translate_animation_translate_set(Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Translate_Animation_Data *pd, Eina_Position2D from, Eina_Position2D to) { @@ -22,8 +22,8 @@ _efl_canvas_animation_translate_translate_set(Eo *eo_obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_animation_translate_translate_get(const Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Animation_Translate_Data *pd, +_efl_canvas_translate_animation_translate_get(const Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Translate_Animation_Data *pd, Eina_Position2D *from, Eina_Position2D *to) { @@ -41,8 +41,8 @@ _efl_canvas_animation_translate_translate_get(const Eo *eo_obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_animation_translate_translate_absolute_set(Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Animation_Translate_Data *pd, +_efl_canvas_translate_animation_translate_absolute_set(Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Translate_Animation_Data *pd, Eina_Position2D from, Eina_Position2D to) { @@ -54,8 +54,8 @@ _efl_canvas_animation_translate_translate_absolute_set(Eo *eo_obj EINA_UNUSED, } EOLIAN static void -_efl_canvas_animation_translate_translate_absolute_get(const Eo *eo_obj EINA_UNUSED, - Efl_Canvas_Animation_Translate_Data *pd, +_efl_canvas_translate_animation_translate_absolute_get(const Eo *eo_obj EINA_UNUSED, + Efl_Canvas_Translate_Animation_Data *pd, Eina_Position2D *from, Eina_Position2D *to) { @@ -73,8 +73,8 @@ _efl_canvas_animation_translate_translate_absolute_get(const Eo *eo_obj EINA_UNU } EOLIAN static double -_efl_canvas_animation_translate_efl_canvas_animation_animation_apply(Eo *eo_obj, - Efl_Canvas_Animation_Translate_Data *pd, +_efl_canvas_translate_animation_efl_canvas_animation_animation_apply(Eo *eo_obj, + Efl_Canvas_Translate_Animation_Data *pd, double progress, Efl_Canvas_Object *target) { @@ -102,8 +102,8 @@ _efl_canvas_animation_translate_efl_canvas_animation_animation_apply(Eo *eo_obj, } EOLIAN static Efl_Object * -_efl_canvas_animation_translate_efl_object_constructor(Eo *eo_obj, - Efl_Canvas_Animation_Translate_Data *pd) +_efl_canvas_translate_animation_efl_object_constructor(Eo *eo_obj, + Efl_Canvas_Translate_Animation_Data *pd) { eo_obj = efl_constructor(efl_super(eo_obj, MY_CLASS)); @@ -115,4 +115,4 @@ _efl_canvas_animation_translate_efl_object_constructor(Eo *eo_obj, return eo_obj; } -#include "efl_canvas_animation_translate.eo.c" +#include "efl_canvas_translate_animation.eo.c" diff --git a/src/lib/evas/canvas/efl_canvas_animation_translate.eo b/src/lib/evas/canvas/efl_canvas_translate_animation.eo similarity index 92% rename from src/lib/evas/canvas/efl_canvas_animation_translate.eo rename to src/lib/evas/canvas/efl_canvas_translate_animation.eo index fdb3883156..23e9fe09b8 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_translate.eo +++ b/src/lib/evas/canvas/efl_canvas_translate_animation.eo @@ -1,4 +1,6 @@ -class Efl.Canvas.Animation_Translate extends Efl.Canvas.Animation +import eina_types; + +class Efl.Canvas.Translate_Animation extends Efl.Canvas.Animation { [[Animated translation effect. @@ -12,7 +14,7 @@ class Efl.Canvas.Animation_Translate extends Efl.Canvas.Animation @since 1.24 ]] c_prefix: efl_animation_translate; - data: Efl_Canvas_Animation_Translate_Data; + data: Efl_Canvas_Translate_Animation_Data; methods { @property translate { [[Translation vector, relative to the starting position of the object. diff --git a/src/lib/evas/canvas/efl_canvas_translate_animation_private.h b/src/lib/evas/canvas/efl_canvas_translate_animation_private.h new file mode 100644 index 0000000000..ba67bb2b9d --- /dev/null +++ b/src/lib/evas/canvas/efl_canvas_translate_animation_private.h @@ -0,0 +1,16 @@ +#define EFL_ANIMATION_PROTECTED + +#include "evas_common_private.h" +#include +#include "efl_canvas_animation_private.h" + +#define EFL_TRANSLATE_ANIMATION_DATA_GET(o, pd) \ + Efl_Canvas_Translate_Animation_Data *pd = efl_data_scope_get(o, EFL_CANVAS_TRANSLATE_ANIMATION_CLASS) + +typedef struct _Efl_Canvas_Translate_Animation_Data +{ + Eina_Position2D from; + Eina_Position2D to; + + Eina_Bool use_rel_move; +} Efl_Canvas_Translate_Animation_Data; diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build index 196b3962bb..35bdb46841 100644 --- a/src/lib/evas/canvas/meson.build +++ b/src/lib/evas/canvas/meson.build @@ -32,13 +32,13 @@ pub_eo_files = [ 'efl_canvas_pointer.eo', 'efl_canvas_scene.eo', 'efl_canvas_animation.eo', - 'efl_canvas_animation_alpha.eo', - 'efl_canvas_animation_rotate.eo', - 'efl_canvas_animation_scale.eo', - 'efl_canvas_animation_translate.eo', - 'efl_canvas_animation_group.eo', - 'efl_canvas_animation_group_parallel.eo', - 'efl_canvas_animation_group_sequential.eo', + 'efl_canvas_alpha_animation.eo', + 'efl_canvas_rotate_animation.eo', + 'efl_canvas_scale_animation.eo', + 'efl_canvas_translate_animation.eo', + 'efl_canvas_group_animation.eo', + 'efl_canvas_parallel_group_animation.eo', + 'efl_canvas_sequential_group_animation.eo', 'efl_canvas_textblock_factory.eo', 'efl_canvas_rectangle.eo', 'efl_canvas_object.eo', @@ -179,13 +179,13 @@ evas_src += files([ 'efl_input_clickable.c', 'efl_input_device.c', 'efl_canvas_animation.c', - 'efl_canvas_animation_alpha.c', - 'efl_canvas_animation_rotate.c', - 'efl_canvas_animation_scale.c', - 'efl_canvas_animation_translate.c', - 'efl_canvas_animation_group.c', - 'efl_canvas_animation_group_parallel.c', - 'efl_canvas_animation_group_sequential.c', + 'efl_canvas_alpha_animation.c', + 'efl_canvas_rotate_animation.c', + 'efl_canvas_scale_animation.c', + 'efl_canvas_translate_animation.c', + 'efl_canvas_group_animation.c', + 'efl_canvas_parallel_group_animation.c', + 'efl_canvas_sequential_group_animation.c', 'efl_gfx_vg_value_provider.c', 'efl_canvas_vg_object.c', 'efl_canvas_vg_node.c',