From 5351070a4d8d4e114823296bed190f079e865d82 Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Tue, 10 Apr 2018 22:03:26 +0900 Subject: [PATCH] efl_canvas_animation_player: Reset map after animation is finished Previously, beginning state of animation is applied after animation is finished if final_state_keep_get() is false. Now, map is reset (no animation is applied) after animation is finished if final_state_keep_get() is false. --- src/lib/evas/canvas/efl_canvas_animation_player.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.c b/src/lib/evas/canvas/efl_canvas_animation_player.c index 1117c495ab..edc9bd1170 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_player.c +++ b/src/lib/evas/canvas/efl_canvas_animation_player.c @@ -213,19 +213,21 @@ _efl_canvas_animation_player_efl_player_stop(Eo *eo_obj, (!(efl_animation_repeat_count_get(anim) & 1))) { pd->progress = 1.0; + efl_animation_apply(anim, pd->progress, + efl_animation_player_target_get(eo_obj)); } else { pd->progress = 0.0; + efl_gfx_map_reset(efl_animation_player_target_get(eo_obj)); } + efl_event_callback_call(eo_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, NULL); } else { pd->progress = 0.0; + efl_gfx_map_reset(efl_animation_player_target_get(eo_obj)); } - efl_animation_apply(anim, pd->progress, efl_animation_player_target_get(eo_obj)); - if (play) - efl_event_callback_call(eo_obj, EFL_ANIMATION_PLAYER_EVENT_ENDED, NULL); if (pd->auto_del) efl_del(eo_obj); }