Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00
Code Issues Projects Releases Wiki Activity

fix(delete): delete animation after the children are deleted

Browse Source 
New animation can be added during child delete
This commit is contained in:
Gabor Kiss-Vamosi 2021-02-11 14:42:48 +01:00
parent dfc6719479
commit 0591dec33a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@
### Bugfixes ### Bugfixes
- fix(indev) clear the indev's `act_obj` in `lv_indev_reset` - fix(indev) clear the indev's `act_obj` in `lv_indev_reset`
- fix(text) fix out of bounds read in `_lv_txt_get_width` - fix(text) fix out of bounds read in `_lv_txt_get_width`
- fix(delete) delete animation after the children are deleted because new animation can be added during child delete
## v7.10.0 ## v7.10.0

12
src/lv_core/lv_obj.c
View File

@ -3764,12 +3764,6 @@ static void obj_del_core(lv_obj_t * obj)
if(group) lv_group_remove_obj(obj); if(group) lv_group_remove_obj(obj);
#endif #endif
/*Remove the animations from this object*/
#if LV_USE_ANIMATION
lv_anim_del(obj, NULL);
trans_del(obj, 0xFF, 0xFF, NULL);
#endif
/*Delete the user data*/ /*Delete the user data*/
#if LV_USE_USER_DATA #if LV_USE_USER_DATA
#if LV_USE_USER_DATA_FREE #if LV_USE_USER_DATA_FREE
@ -3788,6 +3782,12 @@ static void obj_del_core(lv_obj_t * obj)
i = _lv_ll_get_head(&(obj->child_ll)); i = _lv_ll_get_head(&(obj->child_ll));
} }
/*Remove the animations from this object*/
#if LV_USE_ANIMATION
lv_anim_del(obj, NULL);
trans_del(obj, 0xFF, 0xFF, NULL);
#endif
lv_event_mark_deleted(obj); lv_event_mark_deleted(obj);
/* Reset all input devices if the object to delete is used*/ /* Reset all input devices if the object to delete is used*/