Skip to content

Commit b7792f0

Browse files
committed
updates from dev-5.3
1 parent fc319a4 commit b7792f0

6 files changed

+2
-27
lines changed

lv_fonts/lv_font_symbol_10.c

-5
Original file line numberDiff line numberDiff line change
@@ -2836,13 +2836,8 @@ static const lv_font_glyph_dsc_t lv_font_symbol_10_glyph_dsc[] = {
28362836
};
28372837

28382838
lv_font_t lv_font_symbol_10 = {
2839-
#if LV_TXT_UTF8
28402839
.unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/
28412840
.unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/
2842-
#else
2843-
.unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/
2844-
.unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/
2845-
#endif
28462841
.h_px = 10, /*Font height in pixels*/
28472842
.glyph_bitmap = lv_font_symbol_10_glyph_bitmap, /*Bitmap of glyphs*/
28482843
.glyph_dsc = lv_font_symbol_10_glyph_dsc, /*Description of glyphs*/

lv_fonts/lv_font_symbol_20.c

-5
Original file line numberDiff line numberDiff line change
@@ -4836,13 +4836,8 @@ static const lv_font_glyph_dsc_t lv_font_symbol_20_glyph_dsc[] = {
48364836
};
48374837

48384838
lv_font_t lv_font_symbol_20 = {
4839-
#if LV_TXT_UTF8
48404839
.unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/
48414840
.unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/
4842-
#else
4843-
.unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/
4844-
.unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/
4845-
#endif
48464841
.h_px = 20, /*Font height in pixels*/
48474842
.glyph_bitmap = lv_font_symbol_20_glyph_bitmap, /*Bitmap of glyphs*/
48484843
.glyph_dsc = lv_font_symbol_20_glyph_dsc, /*Description of glyphs*/

lv_fonts/lv_font_symbol_30.c

-5
Original file line numberDiff line numberDiff line change
@@ -6835,13 +6835,8 @@ static const lv_font_glyph_dsc_t lv_font_symbol_30_glyph_dsc[] = {
68356835
#endif
68366836
};
68376837
lv_font_t lv_font_symbol_30 = {
6838-
#if LV_TXT_UTF8
68396838
.unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/
68406839
.unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/
6841-
#else
6842-
.unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/
6843-
.unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/
6844-
#endif
68456840
.h_px = 30, /*Font height in pixels*/
68466841
.glyph_bitmap = lv_font_symbol_30_glyph_bitmap, /*Bitmap of glyphs*/
68476842
.glyph_dsc = lv_font_symbol_30_glyph_dsc, /*Description of glyphs*/

lv_fonts/lv_font_symbol_40.c

-5
Original file line numberDiff line numberDiff line change
@@ -8836,13 +8836,8 @@ static const lv_font_glyph_dsc_t lv_font_symbol_40_glyph_dsc[] = {
88368836
};
88378837

88388838
lv_font_t lv_font_symbol_40 = {
8839-
#if LV_TXT_UTF8
88408839
.unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/
88418840
.unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/
8842-
#else
8843-
.unicode_first = LV_SYMBOL_GLYPH_FIRST, /*First Unicode letter in this font*/
8844-
.unicode_last = LV_SYMBOL_GLYPH_LAST, /*Last Unicode letter in this font*/
8845-
#endif
88468841
.h_px = 40, /*Font height in pixels*/
88478842
.glyph_bitmap = lv_font_symbol_40_glyph_bitmap, /*Bitmap of glyphs*/
88488843
.glyph_dsc = lv_font_symbol_40_glyph_dsc, /*Description of glyphs*/

lv_objx/lv_page.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -593,15 +593,10 @@ static bool lv_scrl_design(lv_obj_t * scrl, const lv_area_t * mask, lv_design_mo
593593
lv_obj_t * page = lv_obj_get_parent(scrl);
594594
lv_style_t * style_page = lv_obj_get_style(page);
595595
lv_group_t * g = lv_obj_get_group(page);
596-
if(style_page->body.empty || style_page->body.opa == LV_OPA_TRANSP) { /*Is the background visible?*/
596+
if((style_page->body.empty || style_page->body.opa == LV_OPA_TRANSP) && style_page->body.border.width == 0) { /*Is the background visible?*/
597597
if(lv_group_get_focused(g) == page) {
598598
lv_style_t * style_mod;
599599
style_mod = lv_group_mod_style(g, style_scrl_ori);
600-
/*Be sure the scrollable is not transparent or empty (at least it should have a border)*/
601-
if((style_mod->body.empty || style_mod->body.opa == LV_OPA_TRANSP) && style_mod->body.border.width == 0) {
602-
style_mod->body.border.width = LV_DPI / 20;
603-
style_mod->body.empty = 0;
604-
}
605600
scrl->style_p = style_mod; /*Temporally change the style to the activated */
606601
}
607602
}

lv_objx/lv_win.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ lv_obj_t * lv_win_create(lv_obj_t * par, const lv_obj_t * copy)
101101
lv_win_set_style(new_win, LV_WIN_STYLE_BTN_PR, th->win.btn.pr);
102102
} else {
103103
lv_win_set_style(new_win, LV_WIN_STYLE_BG, &lv_style_plain);
104-
lv_win_set_style(new_win, LV_WIN_STYLE_CONTENT_BG, &lv_style_transp);
104+
lv_win_set_style(new_win, LV_WIN_STYLE_CONTENT_BG, &lv_style_plain);
105105
lv_win_set_style(new_win, LV_WIN_STYLE_CONTENT_SCRL, &lv_style_transp);
106106
lv_win_set_style(new_win, LV_WIN_STYLE_HEADER, &lv_style_plain_color);
107107
}

0 commit comments

Comments
 (0)