github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anim: minor updates

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-05-27 15:10:15 +02:00
parent b6a86f31d7
commit 5ebed4f24e
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lv_misc/lv_anim.c
View File

@@ -96,11 +96,7 @@ 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) { if(new_anim->exec_cb) new_anim->exec_cb(new_anim->var, new_anim->start);
/*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`)*/
@@ -410,14 +406,7 @@ static void anim_task(lv_task_t * param)
new_value = a->path_cb(a); new_value = a->path_cb(a);
/*Apply the calculated value*/ /*Apply the calculated value*/
if(a->exec_cb != NULL) { if(a->exec_cb) a->exec_cb(a->var, new_value);
/*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) {

4
src/lv_misc/lv_anim.h
View File

@@ -106,7 +106,7 @@ void lv_anim_init(lv_anim_t * a);
* LittelvGL's built-in functions can be used. * LittelvGL's built-in functions can be used.
* E.g. lv_obj_set_x * E.g. lv_obj_set_x
*/ */
static inline void lv_anim_set_var_and_cb(lv_anim_t * a, void * var, lv_anim_exec_cb_t exec_cb) static inline void lv_anim_set_exec_cb(lv_anim_t * a, void * var, lv_anim_exec_cb_t exec_cb)
{ {
a->var = var; a->var = var;
a->exec_cb = exec_cb; a->exec_cb = exec_cb;
@@ -146,7 +146,7 @@ static inline void lv_anim_set_values(lv_anim_t * a, lv_anim_value_t start, lv_a
*/ */
static inline void lv_anim_set_custom_exec_cb(lv_anim_t * a, lv_anim_custom_exec_cb_t exec_cb) static inline void lv_anim_set_custom_exec_cb(lv_anim_t * a, lv_anim_custom_exec_cb_t exec_cb)
{ {
a->var = NULL; a->var = a;
a->exec_cb = (lv_anim_exec_cb_t)exec_cb; a->exec_cb = (lv_anim_exec_cb_t)exec_cb;
} }