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

lv_obj_del: remove from the group before delete the children (DEFOCUS might need children)

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2018-06-14 11:17:49 +02:00
parent 1cac01280a
commit 2a15cffbb9
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lv_core/lv_obj.c
View File

@ -265,6 +265,16 @@ lv_res_t lv_obj_del(lv_obj_t * obj)
{ {
lv_obj_invalidate(obj); lv_obj_invalidate(obj);
/*Delete from the group*/
#if USE_LV_GROUP
if(obj->group_p != NULL) lv_group_remove_obj(obj);
#endif
/*Remove the animations from this object*/
#if USE_LV_ANIMATION
lv_anim_del(obj, NULL);
#endif
/*Recursively delete the children*/ /*Recursively delete the children*/
lv_obj_t * i; lv_obj_t * i;
lv_obj_t * i_next; lv_obj_t * i_next;
@ -272,32 +282,13 @@ lv_res_t lv_obj_del(lv_obj_t * obj)
while(i != NULL) { while(i != NULL) {
/*Get the next object before delete this*/ /*Get the next object before delete this*/
i_next = lv_ll_get_next(&(obj->child_ll), i); i_next = lv_ll_get_next(&(obj->child_ll), i);
/*Call the recursive del to the child too*/ /*Call the recursive del to the child too*/
delete_children(i); delete_children(i);
/*Set i to the next node*/ /*Set i to the next node*/
i = i_next; i = i_next;
} }
#if USE_LV_ANIMATION
/*Remove the animations from this object*/
lv_anim_del(obj, NULL);
#endif
/*Delete from the group*/
#if USE_LV_GROUP
if(obj->group_p != NULL) lv_group_remove_obj(obj);
#endif
/* Reset all input devices if
* the currently pressed object is deleted*/
lv_indev_t * indev = lv_indev_next(NULL);
while(indev) {
if(indev->proc.act_obj == obj || indev->proc.last_obj == obj) {
lv_indev_reset(indev);
}
indev = lv_indev_next(indev);
}
/*Remove the object from parent's children list*/ /*Remove the object from parent's children list*/
lv_obj_t * par = lv_obj_get_parent(obj); lv_obj_t * par = lv_obj_get_parent(obj);
@ -307,6 +298,16 @@ lv_res_t lv_obj_del(lv_obj_t * obj)
lv_ll_rem(&(par->child_ll), obj); lv_ll_rem(&(par->child_ll), obj);
} }
/* Reset all input devices if
* the currently pressed object is deleted*/
lv_indev_t * indev = lv_indev_next(NULL);
while(indev) {
if(indev->proc.act_obj == obj || indev->proc.last_obj == obj) {
lv_indev_reset(indev);
}
indev = lv_indev_next(indev);
}
/* All children deleted. /* All children deleted.
* Now clean up the object specific data*/ * Now clean up the object specific data*/
obj->signal_func(obj, LV_SIGNAL_CLEANUP, NULL); obj->signal_func(obj, LV_SIGNAL_CLEANUP, NULL);