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

lv_btnm: minor fix on label's position with transparent button style

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2018-10-03 08:47:21 +02:00
parent fbff08080a
commit 85bd5a9933
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lv_objx/lv_btnm.c
View File

@@ -462,8 +462,8 @@ static bool lv_btnm_design(lv_obj_t * btnm, const lv_area_t * mask, lv_design_mo
btn_style->body.border.part = LV_BORDER_RIGHT; btn_style->body.border.part = LV_BORDER_RIGHT;
} }
/*Calculate the size of the text*/ /*Calculate the size of the text*/
if(btn_style->glass) btn_style = bg_style;
const lv_font_t * font = btn_style->text.font; const lv_font_t * font = btn_style->text.font;
lv_point_t txt_size; lv_point_t txt_size;
lv_txt_get_size(&txt_size, ext->map_p[txt_i], font, lv_txt_get_size(&txt_size, ext->map_p[txt_i], font,
@@ -476,7 +476,6 @@ static bool lv_btnm_design(lv_obj_t * btnm, const lv_area_t * mask, lv_design_mo
area_tmp.y2 = area_tmp.y1 + txt_size.y; area_tmp.y2 = area_tmp.y1 + txt_size.y;
if(btn_style->glass) btn_style = bg_style;
lv_draw_label(&area_tmp, mask, btn_style, opa_scale, ext->map_p[txt_i], LV_TXT_FLAG_NONE, NULL); lv_draw_label(&area_tmp, mask, btn_style, opa_scale, ext->map_p[txt_i], LV_TXT_FLAG_NONE, NULL);
} }
} }