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

rename enums to be general (e.g. lv_cont_layout_t -> lv_layout_t)

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2017-11-18 00:18:19 +01:00
parent 7753257842
commit a006082a47
24 changed files with 277 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lv_obj/lv_obj.c
View File

@@ -21,6 +21,8 @@
/*********************
* DEFINES
*********************/
#define LV_OBJ_DEF_WIDTH (LV_DPI)
#define LV_OBJ_DEF_HEIGHT (2 * LV_DPI / 3)
/**********************
* TYPEDEFS
@@ -1268,8 +1270,8 @@ lv_style_t * lv_obj_get_style(lv_obj_t * obj)
if(style_act == NULL) {
lv_obj_t * par = obj->par;
while(par != NULL) {
if(par->style_p != NULL) {
while(par) {
if(par->style_p) {
if(par->style_p->glass == 0) {
style_act = par->style_p;
break;
@@ -1279,7 +1281,7 @@ lv_style_t * lv_obj_get_style(lv_obj_t * obj)
}
}
#if LV_OBJ_GROUP != 0
if(obj->group_p != NULL) {
if(obj->group_p) {
if(lv_group_get_focused(obj->group_p) == obj) {
style_act = lv_group_mod_style(obj->group_p, style_act);
}