From 20282ce89fccfc00a9b1aec080fc43bf4953c260 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 18 Feb 2019 05:57:04 +0100 Subject: [PATCH 1/3] remove var. declaration in for loop header --- lv_objx/lv_chart.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lv_objx/lv_chart.c b/lv_objx/lv_chart.c index 3bd6f5304..0060c1499 100644 --- a/lv_objx/lv_chart.c +++ b/lv_objx/lv_chart.c @@ -175,9 +175,10 @@ void lv_chart_clear_serie(lv_obj_t * chart, lv_chart_series_t * serie) if(chart == NULL || serie == NULL) return; lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart); - if(ext == NULL) - return; - for(uint32_t i = 0; i < ext->point_cnt; i++) + if(ext == NULL) return; + + uint32_t i; + for(i = 0; i < ext->point_cnt; i++) { serie->points[i] = LV_CHART_POINT_DEF; } From 9572c7d4edbe9b06bb119a4ad8e7222dae8ab4e0 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 18 Feb 2019 05:57:18 +0100 Subject: [PATCH 2/3] lv_imgbtn: bugfix --- lv_objx/lv_imgbtn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lv_objx/lv_imgbtn.c b/lv_objx/lv_imgbtn.c index 3f97d5d67..ed1d72b42 100644 --- a/lv_objx/lv_imgbtn.c +++ b/lv_objx/lv_imgbtn.c @@ -385,7 +385,7 @@ static void refr_img(lv_obj_t * imgbtn) ext->act_cf = LV_IMG_CF_UNKOWN; } - + lv_obj_invalidate(imgbtn); } #endif From 62195b7cc7c9c9dc643985c11f4f4de6571b530c Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 18 Feb 2019 06:41:02 +0100 Subject: [PATCH 3/3] lv_label_draw fix with offset.y --- lv_draw/lv_draw_label.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lv_draw/lv_draw_label.c b/lv_draw/lv_draw_label.c index d80c9a0c2..0744ff114 100644 --- a/lv_draw/lv_draw_label.c +++ b/lv_draw/lv_draw_label.c @@ -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.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_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_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*/ #if LV_VDB_SIZE == 0 lv_rletter_set_background(style->body.main_color);