diff options
Diffstat (limited to 'src/bin/elementary/test_efl_anim_translate.c')
| -rw-r--r-- | src/bin/elementary/test_efl_anim_translate.c | 71 |
1 files changed, 33 insertions, 38 deletions
diff --git a/src/bin/elementary/test_efl_anim_translate.c b/src/bin/elementary/test_efl_anim_translate.c index d76e927f67..a562d17d65 100644 --- a/src/bin/elementary/test_efl_anim_translate.c +++ b/src/bin/elementary/test_efl_anim_translate.c @@ -5,9 +5,9 @@ typedef struct _App_Data { - Efl_Animation *translate_rb_anim; - Efl_Animation *translate_lt_anim; - Efl_Animation_Object *anim_obj; + Efl_Canvas_Animation *translate_rb_anim; + Efl_Canvas_Animation *translate_lt_anim; + Efl_Canvas_Animation_Player *anim_obj; Eina_Bool is_btn_translated; } App_Data; @@ -19,20 +19,16 @@ _anim_started_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) } static void -_anim_ended_cb(void *data, const Efl_Event *event EINA_UNUSED) +_anim_ended_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) { - App_Data *ad = data; - printf("Animation has been ended!\n"); - - ad->anim_obj = NULL; } static void _anim_running_cb(void *data EINA_UNUSED, const Efl_Event *event) { - Efl_Animation_Object_Running_Event_Info *event_info = event->info; - double progress = event_info->progress; + Efl_Canvas_Animation_Player_Event_Running *event_running = event->info; + double progress = event_running->progress; printf("Animation is running! Current progress(%lf)\n", progress); } @@ -41,35 +37,23 @@ _btn_clicked_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { App_Data *ad = data; - if (ad->anim_obj) - efl_animation_object_cancel(ad->anim_obj); - ad->is_btn_translated = !(ad->is_btn_translated); if (ad->is_btn_translated) { //Create Animation Object from Animation - ad->anim_obj = efl_animation_object_create(ad->translate_rb_anim); - elm_object_text_set(obj, "Start Translate Animation to left top"); + efl_animation_player_animation_set(ad->anim_obj, ad->translate_rb_anim); + efl_text_set(obj, "Start Translate Animation to left top"); } else { //Create Animation Object from Animation - ad->anim_obj = efl_animation_object_create(ad->translate_lt_anim); - elm_object_text_set(obj, "Start Translate Animation to right bottom"); + efl_animation_player_animation_set(ad->anim_obj, ad->translate_lt_anim); + efl_text_set(obj, "Start Translate Animation to right bottom"); } - - //Register callback called when animation starts - efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_OBJECT_EVENT_STARTED, _anim_started_cb, NULL); - - //Register callback called when animation ends - efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_OBJECT_EVENT_ENDED, _anim_ended_cb, ad); - - //Register callback called while animation is executed - efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_OBJECT_EVENT_RUNNING, _anim_running_cb, NULL); - + //Let Animation Object start animation - efl_animation_object_start(ad->anim_obj); + efl_player_start(ad->anim_obj); } static void @@ -99,23 +83,29 @@ test_efl_anim_translate(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo evas_object_show(btn); //Translate Animation to right bottom relatively - Efl_Animation *translate_rb_anim = efl_add(EFL_ANIMATION_TRANSLATE_CLASS, NULL); + Efl_Canvas_Animation *translate_rb_anim = efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); efl_animation_translate_set(translate_rb_anim, 0, 0, 100, 100); efl_animation_duration_set(translate_rb_anim, 1.0); - efl_animation_target_set(translate_rb_anim, btn); efl_animation_final_state_keep_set(translate_rb_anim, EINA_TRUE); //Translate Animation to left top relatively - Efl_Animation *translate_lt_anim = efl_add(EFL_ANIMATION_TRANSLATE_CLASS, NULL); + Efl_Canvas_Animation *translate_lt_anim = efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); efl_animation_translate_set(translate_lt_anim, 100, 100, 0, 0); efl_animation_duration_set(translate_lt_anim, 1.0); - efl_animation_target_set(translate_lt_anim, btn); efl_animation_final_state_keep_set(translate_lt_anim, EINA_TRUE); //Initialize App Data ad->translate_rb_anim = translate_rb_anim; ad->translate_lt_anim = translate_lt_anim; - ad->anim_obj = NULL; + ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win, + efl_animation_player_target_set(efl_added, btn)); + //Register callback called when animation starts + efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, NULL); + //Register callback called when animation ends + efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, NULL); + //Register callback called while animation is executed + efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL); + ad->is_btn_translated = EINA_FALSE; //Button to start animation @@ -159,24 +149,29 @@ 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_Animation *translate_rb_anim = efl_add(EFL_ANIMATION_TRANSLATE_CLASS, NULL); + Efl_Canvas_Animation *translate_rb_anim = efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); efl_animation_translate_absolute_set(translate_rb_anim, 0, 0, 100, 100); efl_animation_duration_set(translate_rb_anim, 1.0); - efl_animation_target_set(translate_rb_anim, btn); efl_animation_final_state_keep_set(translate_rb_anim, EINA_TRUE); //Translate Animation to left top absolutely - Efl_Animation *translate_lt_anim = efl_add(EFL_ANIMATION_TRANSLATE_CLASS, NULL); + Efl_Canvas_Animation *translate_lt_anim = efl_add(EFL_CANVAS_ANIMATION_TRANSLATE_CLASS, win); efl_animation_translate_absolute_set(translate_lt_anim, 100, 100, 0, 0); efl_animation_duration_set(translate_lt_anim, 1.0); - efl_animation_target_set(translate_lt_anim, btn); efl_animation_final_state_keep_set(translate_lt_anim, EINA_TRUE); //Initialize App Data ad->translate_rb_anim = translate_rb_anim; ad->translate_lt_anim = translate_lt_anim; - ad->anim_obj = NULL; ad->is_btn_translated = EINA_FALSE; + ad->anim_obj = efl_add(EFL_CANVAS_ANIMATION_PLAYER_CLASS, win, + efl_animation_player_target_set(efl_added, btn)); + //Register callback called when animation starts + efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_STARTED, _anim_started_cb, NULL); + //Register callback called when animation ends + efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, _anim_ended_cb, NULL); + //Register callback called while animation is executed + efl_event_callback_add(ad->anim_obj, EFL_ANIMATION_PLAYER_EVENT_RUNNING, _anim_running_cb, NULL); //Button to start animation Evas_Object *btn2 = elm_button_add(win); |