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

Remove from group before deleting children

Browse Source
This commit is contained in:
Brian Pugh 2019-01-06 11:24:22 -08:00
parent 61bb01e06d
commit 239ed85889
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lv_core/lv_obj.c
View File

@ -1920,6 +1920,14 @@ static void delete_children(lv_obj_t * obj)
lv_obj_t * i; lv_obj_t * i;
lv_obj_t * i_next; lv_obj_t * i_next;
i = lv_ll_get_head(&(obj->child_ll)); i = lv_ll_get_head(&(obj->child_ll));
/*Remove from the group; remove before transversing children so that
* the object still has access to all children during the
* LV_SIGNAL_DEFOCUS call*/
#if USE_LV_GROUP
if(obj->group_p != NULL) lv_group_remove_obj(obj);
#endif
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);
@ -1936,10 +1944,6 @@ static void delete_children(lv_obj_t * obj)
lv_anim_del(obj, NULL); lv_anim_del(obj, NULL);
#endif #endif
/*Delete from the group*/
#if USE_LV_GROUP
if(obj->group_p != NULL) lv_group_remove_obj(obj);
#endif
/* Reset the input devices if /* Reset the input devices if
* the currently pressed object is deleted*/ * the currently pressed object is deleted*/