Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

anim: combint var and exec_cb set into lv_anim_set_var_and_cb

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-05-27 05:42:34 +02:00
parent 62ffe5ab94
commit f2afc18d6b
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lv_misc/lv_anim.c
View File

@ -96,7 +96,11 @@ void lv_anim_create(lv_anim_t * a)
memcpy(new_anim, a, sizeof(lv_anim_t)); memcpy(new_anim, a, sizeof(lv_anim_t));
/*Set the start value*/ /*Set the start value*/
if(new_anim->exec_cb != NULL) new_anim->exec_cb(new_anim->var, new_anim->start); if(new_anim->exec_cb != NULL) {
/*Pass `new_anim` if `var` is not set*/
if(a->var) new_anim->exec_cb(new_anim->var, new_anim->start);
else new_anim->exec_cb(new_anim, new_anim->start);
}
/* Creating an animation changed the linked list. /* Creating an animation changed the linked list.
* It's important if it happens in a ready callback. (see `anim_task`)*/ * It's important if it happens in a ready callback. (see `anim_task`)*/
@ -385,6 +389,7 @@ static void anim_task(lv_task_t * param)
} }
uint32_t elaps = lv_tick_elaps(last_task_run); uint32_t elaps = lv_tick_elaps(last_task_run);
a = lv_ll_get_head(&LV_GC_ROOT(_lv_anim_ll)); a = lv_ll_get_head(&LV_GC_ROOT(_lv_anim_ll));
while(a != NULL) { while(a != NULL) {
@ -404,7 +409,15 @@ static void anim_task(lv_task_t * param)
int32_t new_value; int32_t new_value;
new_value = a->path_cb(a); new_value = a->path_cb(a);
if(a->exec_cb != NULL) a->exec_cb(a->var, new_value); /*Apply the calculated value*/ /*Apply the calculated value*/
if(a->exec_cb != NULL) {
/*Pass `a` as first parameter if `var` is not set*/
if(a->var) {
a->exec_cb(a->var, new_value);
} else {
a->exec_cb(a, new_value);
}
}
/*If the time is elapsed the animation is ready*/ /*If the time is elapsed the animation is ready*/
if(a->act_time >= a->time) { if(a->act_time >= a->time) {