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

merge beta

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2018-07-30 06:56:31 +02:00
parent 769c7b28ff 818cd278b2
commit c2712963d6
6 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lv_core/lv_obj.c
View File

@@ -201,7 +201,12 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent,const lv_obj_t * copy)
new_obj->ext_size = 0;
/*Set appearance*/
new_obj->style_p = &lv_style_plain_color;
lv_theme_t * th = lv_theme_get_current();
if(th) {
new_obj->style_p = th->panel;
} else {
new_obj->style_p = &lv_style_plain_color;
}
/*Set virtual functions*/
lv_obj_set_signal_func(new_obj, lv_obj_signal);

4
lv_core/lv_style.c
View File

@@ -145,12 +145,12 @@ void lv_style_init(void)
lv_style_transp.glass = 1;
lv_style_transp.body.border.width = 0;
/*Transparent tight style*/
/*Transparent fitting size*/
memcpy(&lv_style_transp_fit, &lv_style_transp, sizeof(lv_style_t));
lv_style_transp_fit.body.padding.hor = 0;
lv_style_transp_fit.body.padding.ver = 0;
/*Transparent fitting size*/
/*Transparent tight style*/
memcpy(&lv_style_transp_tight, &lv_style_transp_fit, sizeof(lv_style_t));
lv_style_transp_tight.body.padding.inner = 0;