From 0ff6026df80d610e9b3b1bc1e94e56190b494d38 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Sun, 28 Oct 2018 23:14:59 +0100 Subject: [PATCH] improve page focus styling --- lv_objx/lv_page.c | 7 +------ lv_objx/lv_win.c | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lv_objx/lv_page.c b/lv_objx/lv_page.c index 9e19261d8..3f47b2741 100644 --- a/lv_objx/lv_page.c +++ b/lv_objx/lv_page.c @@ -593,15 +593,10 @@ static bool lv_scrl_design(lv_obj_t * scrl, const lv_area_t * mask, lv_design_mo lv_obj_t * page = lv_obj_get_parent(scrl); lv_style_t * style_page = lv_obj_get_style(page); lv_group_t * g = lv_obj_get_group(page); - if(style_page->body.empty || style_page->body.opa == LV_OPA_TRANSP) { /*Is the background visible?*/ + if((style_page->body.empty || style_page->body.opa == LV_OPA_TRANSP) && style_page->body.border.width == 0) { /*Is the background visible?*/ if(lv_group_get_focused(g) == page) { lv_style_t * style_mod; style_mod = lv_group_mod_style(g, style_scrl_ori); - /*Be sure the scrollable is not transparent or empty (at least it should have a border)*/ - if((style_mod->body.empty || style_mod->body.opa == LV_OPA_TRANSP) && style_mod->body.border.width == 0) { - style_mod->body.border.width = LV_DPI / 20; - style_mod->body.empty = 0; - } scrl->style_p = style_mod; /*Temporally change the style to the activated */ } } diff --git a/lv_objx/lv_win.c b/lv_objx/lv_win.c index a106c98d0..8b40c2b7c 100644 --- a/lv_objx/lv_win.c +++ b/lv_objx/lv_win.c @@ -101,7 +101,7 @@ lv_obj_t * lv_win_create(lv_obj_t * par, const lv_obj_t * copy) lv_win_set_style(new_win, LV_WIN_STYLE_BTN_PR, th->win.btn.pr); } else { lv_win_set_style(new_win, LV_WIN_STYLE_BG, &lv_style_plain); - lv_win_set_style(new_win, LV_WIN_STYLE_CONTENT_BG, &lv_style_transp); + lv_win_set_style(new_win, LV_WIN_STYLE_CONTENT_BG, &lv_style_plain); lv_win_set_style(new_win, LV_WIN_STYLE_CONTENT_SCRL, &lv_style_transp); lv_win_set_style(new_win, LV_WIN_STYLE_HEADER, &lv_style_plain_color); }