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

lv_group: do not modify the focused style if the syle_mod function is NULL

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2018-12-22 20:41:20 +01:00
parent bfba1c477f
commit 4c2df29808
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lv_core/lv_group.c
View File

@@ -373,11 +373,9 @@ lv_style_t * lv_group_mod_style(lv_group_t * group, const lv_style_t * style)
lv_style_copy(&group->style_tmp, style);
if(group->editing) {
if(group->style_mod_edit != NULL) group->style_mod_edit(&group->style_tmp);
else style_mod_edit_def(&group->style_tmp);
if(group->style_mod_edit) group->style_mod_edit(&group->style_tmp);
} else {
if(group->style_mod != NULL) group->style_mod(&group->style_tmp);
else style_mod_def(&group->style_tmp);
if(group->style_mod) group->style_mod(&group->style_tmp);
}
return &group->style_tmp;
}