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

lv_obj: bugfix: free_num and free_p were not copied

Browse Source
This commit is contained in:
Gabor
2017-01-06 13:33:54 +01:00
parent 0e964e0b8b
commit 70651778e4
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lv_obj/lv_obj.c
View File

@@ -198,6 +198,12 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
lv_obj_set_signal_f(new_obj, lv_obj_signal); lv_obj_set_signal_f(new_obj, lv_obj_signal);
lv_obj_set_design_f(new_obj, lv_obj_design); lv_obj_set_design_f(new_obj, lv_obj_design);
/*Set free data*/
new_obj->free_num = 0;
#if LV_OBJ_FREE_P != 0
new_obj->free_p = NULL;
#endif
/*Set attributes*/ /*Set attributes*/
new_obj->click_en = 0; new_obj->click_en = 0;
new_obj->drag_en = 0; new_obj->drag_en = 0;
@@ -234,6 +240,12 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
/*Set virtual functions*/ /*Set virtual functions*/
lv_obj_set_signal_f(new_obj, lv_obj_signal); lv_obj_set_signal_f(new_obj, lv_obj_signal);
lv_obj_set_design_f(new_obj, lv_obj_design); lv_obj_set_design_f(new_obj, lv_obj_design);
/*Set free data*/
new_obj->free_num = 0;
#if LV_OBJ_FREE_P != 0
new_obj->free_p = NULL;
#endif
/*Set attributes*/ /*Set attributes*/
new_obj->click_en = 1; new_obj->click_en = 1;
@@ -255,6 +267,11 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
new_obj->opa = copy->opa; new_obj->opa = copy->opa;
/*Set free data*/
new_obj->free_num = copy->free_num;
#if LV_OBJ_FREE_P != 0
new_obj->free_p = copy->free_p;
#endif
/*Set attributes*/ /*Set attributes*/
new_obj->click_en = copy->click_en; new_obj->click_en = copy->click_en;
new_obj->drag_en = copy->drag_en; new_obj->drag_en = copy->drag_en;