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

LV_GROUP rename

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2017-12-07 10:38:25 +01:00
parent 266487fdab
commit 8bd9ab7b84
14 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lv_core/lv_obj.c
View File

@@ -146,7 +146,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
new_obj->free_ptr = NULL;
#endif
#if LV_GROUP != 0
#if LV_OBJ_GROUP
new_obj->group_p = NULL;
#endif
/*Set attributes*/
@@ -191,7 +191,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
#if LV_OBJ_FREE_PTR != 0
new_obj->free_ptr = NULL;
#endif
#if LV_GROUP != 0
#if LV_OBJ_GROUP
new_obj->group_p = NULL;
#endif
@@ -229,7 +229,7 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, lv_obj_t * copy)
new_obj->style_p = copy->style_p;
#if LV_GROUP != 0
#if LV_OBJ_GROUP
/*Add to the same group*/
if(copy->group_p != NULL) {
lv_group_add_obj(copy->group_p, new_obj);
@@ -1204,7 +1204,7 @@ lv_style_t * lv_obj_get_style(lv_obj_t * obj)
par = par->par;
}
}
#if LV_GROUP != 0
#if LV_OBJ_GROUP
if(obj->group_p) {
if(lv_group_get_focused(obj->group_p) == obj) {
style_act = lv_group_mod_style(obj->group_p, style_act);
@@ -1361,7 +1361,7 @@ void * lv_obj_get_free_ptr(lv_obj_t * obj)
}
#endif
#if LV_GROUP != 0
#if LV_OBJ_GROUP
/**
* Get the group of the object
* @param obj pointer to an object
@@ -1537,7 +1537,7 @@ static void delete_children(lv_obj_t * obj)
#endif
/*Delete from the group*/
#if LV_GROUP != 0
#if LV_OBJ_GROUP
if(obj->group_p != NULL) lv_group_remove_obj(obj);
#endif