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

fix(indev): use lv_anim_delete to delete scroll_throw_anim (#5324)

Browse Source 
Signed-off-by: YanXiaowei <yanxiaowei@xiaomi.com>
Co-authored-by: YanXiaowei <yanxiaowei@xiaomi.com>
This commit is contained in:
bjsylvia 2024-01-15 18:38:13 +08:00 committed by GitHub
parent 57cda3b91c
commit 751bc99b98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/indev/lv_indev.c
View File

@ -1564,9 +1564,8 @@ static void indev_scroll_throw_anim_cb(void * var, int32_t v)
if(indev->pointer.scroll_dir == LV_DIR_NONE || indev->pointer.scroll_obj == NULL) { if(indev->pointer.scroll_dir == LV_DIR_NONE || indev->pointer.scroll_obj == NULL) {
if(indev->scroll_throw_anim) { if(indev->scroll_throw_anim) {
/*hacky*/
LV_LOG_INFO("stop animation"); LV_LOG_INFO("stop animation");
lv_anim_set_duration(indev->scroll_throw_anim, 0); lv_anim_delete(indev, indev_scroll_throw_anim_cb);
} }
} }
} }

4
src/misc/lv_anim.c
View File

@ -379,11 +379,11 @@ static void anim_timer(lv_timer_t * param)
a->current_value = new_value; a->current_value = new_value;
/*Apply the calculated value*/ /*Apply the calculated value*/
if(a->exec_cb) a->exec_cb(a->var, new_value); if(a->exec_cb) a->exec_cb(a->var, new_value);
if(a->custom_exec_cb) a->custom_exec_cb(a, new_value); if(!state.anim_list_changed && a->custom_exec_cb) a->custom_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->duration) { if(!state.anim_list_changed && a->act_time >= a->duration) {
anim_ready_handler(a); anim_ready_handler(a);
} }
} }