From 94e686ba4407f61a4390704c21dab9ffb23b14a7 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Sat, 13 Jan 2018 08:18:10 +0100 Subject: [PATCH] lv_obj_get_style: with NULL style check if the parent is focused and use the focused style --- lv_core/lv_obj.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lv_core/lv_obj.c b/lv_core/lv_obj.c index bb4cecbf1..fd4d30b1d 100644 --- a/lv_core/lv_obj.c +++ b/lv_core/lv_obj.c @@ -1202,7 +1202,17 @@ lv_style_t * lv_obj_get_style(lv_obj_t * obj) while(par) { if(par->style_p) { if(par->style_p->glass == 0) { +#if USE_LV_GROUP == 0 style_act = par->style_p; +#else + /*Is a parent is focused then use then focused style*/ + lv_group_t *g = lv_obj_get_group(par); + if(lv_group_get_focused(g) == par) { + style_act = lv_group_mod_style(g, par->style_p); + } else { + style_act = par->style_p; + } +#endif break; } }