diff --git a/lv_fonts/lv_font_symbol_10.c b/lv_fonts/lv_font_symbol_10.c index f1f1ae200f..586b3d8171 100644 --- a/lv_fonts/lv_font_symbol_10.c +++ b/lv_fonts/lv_font_symbol_10.c @@ -2836,13 +2836,8 @@ static const lv_font_glyph_dsc_t lv_font_symbol_10_glyph_dsc[] = { }; lv_font_t lv_font_symbol_10 = { -#if LV_TXT_UTF8 .unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/ .unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/ -#else - .unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/ - .unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/ -#endif .h_px = 10, /*Font height in pixels*/ .glyph_bitmap = lv_font_symbol_10_glyph_bitmap, /*Bitmap of glyphs*/ .glyph_dsc = lv_font_symbol_10_glyph_dsc, /*Description of glyphs*/ diff --git a/lv_fonts/lv_font_symbol_20.c b/lv_fonts/lv_font_symbol_20.c index 9bce90e0d3..3a691f5995 100644 --- a/lv_fonts/lv_font_symbol_20.c +++ b/lv_fonts/lv_font_symbol_20.c @@ -4836,13 +4836,8 @@ static const lv_font_glyph_dsc_t lv_font_symbol_20_glyph_dsc[] = { }; lv_font_t lv_font_symbol_20 = { -#if LV_TXT_UTF8 .unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/ .unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/ -#else - .unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/ - .unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/ -#endif .h_px = 20, /*Font height in pixels*/ .glyph_bitmap = lv_font_symbol_20_glyph_bitmap, /*Bitmap of glyphs*/ .glyph_dsc = lv_font_symbol_20_glyph_dsc, /*Description of glyphs*/ diff --git a/lv_fonts/lv_font_symbol_30.c b/lv_fonts/lv_font_symbol_30.c index 7426c6d7ab..0a0f386848 100644 --- a/lv_fonts/lv_font_symbol_30.c +++ b/lv_fonts/lv_font_symbol_30.c @@ -6835,13 +6835,8 @@ static const lv_font_glyph_dsc_t lv_font_symbol_30_glyph_dsc[] = { #endif }; lv_font_t lv_font_symbol_30 = { -#if LV_TXT_UTF8 .unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/ .unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/ -#else - .unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/ - .unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/ -#endif .h_px = 30, /*Font height in pixels*/ .glyph_bitmap = lv_font_symbol_30_glyph_bitmap, /*Bitmap of glyphs*/ .glyph_dsc = lv_font_symbol_30_glyph_dsc, /*Description of glyphs*/ diff --git a/lv_fonts/lv_font_symbol_40.c b/lv_fonts/lv_font_symbol_40.c index 07c346f1e4..eacbde0c94 100644 --- a/lv_fonts/lv_font_symbol_40.c +++ b/lv_fonts/lv_font_symbol_40.c @@ -8836,13 +8836,8 @@ static const lv_font_glyph_dsc_t lv_font_symbol_40_glyph_dsc[] = { }; lv_font_t lv_font_symbol_40 = { -#if LV_TXT_UTF8 .unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/ .unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/ -#else - .unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/ - .unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/ -#endif .h_px = 40, /*Font height in pixels*/ .glyph_bitmap = lv_font_symbol_40_glyph_bitmap, /*Bitmap of glyphs*/ .glyph_dsc = lv_font_symbol_40_glyph_dsc, /*Description of glyphs*/ diff --git a/lv_objx/lv_page.c b/lv_objx/lv_page.c index 9e19261d88..3f47b27416 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 a106c98d02..8b40c2b7c8 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); }