From 78ee8e6cd78507bfd740496e3df124952179c35c Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Fri, 29 Oct 2021 09:28:36 -0500 Subject: [PATCH] fix(anim): remove time_orig from lv_anim_t (#2744) swap time and playback_time instead to save four bytes Signed-off-by: Xiang Xiao --- src/misc/lv_anim.c | 7 ++++--- src/misc/lv_anim.h | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/misc/lv_anim.c b/src/misc/lv_anim.c index 5ed1385da..5ce55835c 100644 --- a/src/misc/lv_anim.c +++ b/src/misc/lv_anim.c @@ -95,7 +95,6 @@ lv_anim_t * lv_anim_start(const lv_anim_t * a) /*Initialize the animation descriptor*/ lv_memcpy(new_anim, a, sizeof(lv_anim_t)); if(a->var == a) new_anim->var = new_anim; - new_anim->time_orig = a->time; new_anim->run_round = anim_run_round; /*Set the start value*/ @@ -428,8 +427,10 @@ static void anim_ready_handler(lv_anim_t * a) tmp = a->start_value; a->start_value = a->end_value; a->end_value = tmp; - - a->time = a->playback_now == 0 ? a->time_orig : a->playback_time; + /*Swap the time and playback_time*/ + tmp = a->time; + a->time = a->playback_time; + a->playback_time = tmp; } } } diff --git a/src/misc/lv_anim.h b/src/misc/lv_anim.h index 53b75b0d2..be538e00a 100644 --- a/src/misc/lv_anim.h +++ b/src/misc/lv_anim.h @@ -88,7 +88,6 @@ typedef struct _lv_anim_t { uint8_t playback_now : 1; /**< Play back is in progress*/ uint8_t run_round : 1; /**< Indicates the animation has run in this round*/ uint8_t start_cb_called : 1; /**< Indicates that the `start_cb` was already called*/ - uint32_t time_orig; } lv_anim_t; /**********************