Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:littlevgl/lvgl

Browse Source
This commit is contained in:
Themba Dube 2019-02-18 12:16:16 -05:00
commit 153f16fc05
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lv_draw/lv_draw_label.c
View File

@ -78,6 +78,14 @@ void lv_draw_label(const lv_area_t * coords, const lv_area_t * mask, const lv_st
pos.x = coords->x1; pos.x = coords->x1;
pos.y = coords->y1; pos.y = coords->y1;
lv_coord_t x_ofs = 0;
lv_coord_t y_ofs = 0;
if(offset != NULL) {
x_ofs = offset->x;
y_ofs = offset->y;
pos.y += y_ofs;
}
uint32_t line_start = 0; uint32_t line_start = 0;
uint32_t line_end = lv_txt_get_next_line(txt, font, style->text.letter_space, w, flag); uint32_t line_end = lv_txt_get_next_line(txt, font, style->text.letter_space, w, flag);
@ -115,14 +123,6 @@ void lv_draw_label(const lv_area_t * coords, const lv_area_t * mask, const lv_st
lv_color_t recolor; lv_color_t recolor;
lv_coord_t letter_w; lv_coord_t letter_w;
lv_coord_t x_ofs = 0;
lv_coord_t y_ofs = 0;
if(offset != NULL) {
x_ofs = offset->x;
y_ofs = offset->y;
pos.y += y_ofs;
}
/*Real draw need a background color for higher bpp letter*/ /*Real draw need a background color for higher bpp letter*/
#if LV_VDB_SIZE == 0 #if LV_VDB_SIZE == 0
lv_rletter_set_background(style->body.main_color); lv_rletter_set_background(style->body.main_color);

7
lv_objx/lv_chart.c
View File

@ -175,9 +175,10 @@ void lv_chart_clear_serie(lv_obj_t * chart, lv_chart_series_t * serie)
if(chart == NULL || serie == NULL) if(chart == NULL || serie == NULL)
return; return;
lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart); lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
if(ext == NULL) if(ext == NULL) return;
return;
for(uint32_t i = 0; i < ext->point_cnt; i++) uint32_t i;
for(i = 0; i < ext->point_cnt; i++)
{ {
serie->points[i] = LV_CHART_POINT_DEF; serie->points[i] = LV_CHART_POINT_DEF;
} }

2
lv_objx/lv_imgbtn.c
View File

@ -385,7 +385,7 @@ static void refr_img(lv_obj_t * imgbtn)
ext->act_cf = LV_IMG_CF_UNKOWN; ext->act_cf = LV_IMG_CF_UNKOWN;
} }
lv_obj_invalidate(imgbtn);
} }
#endif #endif