From 5f1b6bc28107c25a7af8579982fcc200d501c37e Mon Sep 17 00:00:00 2001 From: Themba Dube Date: Thu, 7 May 2020 16:36:51 -0400 Subject: [PATCH 1/3] Add lv_roller_set_fix_width to API map --- src/lv_api_map.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/lv_api_map.h b/src/lv_api_map.h index 1c9491a98..bf85135aa 100644 --- a/src/lv_api_map.h +++ b/src/lv_api_map.h @@ -128,6 +128,23 @@ static inline bool lv_slider_get_sym(lv_obj_t * slider) return lv_bar_get_sym(slider); } +#endif + +#if LV_USE_ROLLER + +/** + * Set a fixed width for the roller. + * @param roller pointer to a roller object + * @param w width + * @deprecated As of v7.0, you should use `lv_roller_set_auto_fit` and set the width normally instead. + */ +static inline void lv_roller_set_fix_width(lv_obj_t * roller, lv_coord_t w) +{ + lv_roller_set_auto_fit(roller, false); + lv_obj_set_width(roller, w); +} + + #endif /********************** From 18834904ef609578d4b7adb77ceee5143e149bb4 Mon Sep 17 00:00:00 2001 From: Georgi Momchilov Date: Mon, 11 May 2020 15:35:49 +0300 Subject: [PATCH 2/3] Update lv_draw_label.c (#1494) --- src/lv_draw/lv_draw_label.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lv_draw/lv_draw_label.c b/src/lv_draw/lv_draw_label.c index fcd9f5b0f..7948b945c 100644 --- a/src/lv_draw/lv_draw_label.c +++ b/src/lv_draw/lv_draw_label.c @@ -727,7 +727,7 @@ static void draw_letter_subpx(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_ #endif #if LV_FONT_SUBPX_BGR - res_color.ch.blue = (uint326_t)((uint32_t)txt_rgb[0] * font_rgb[0] + (bg_rgb[0] * (255 - font_rgb[0]))) >> 8; + res_color.ch.blue = (uint32_t)((uint32_t)txt_rgb[0] * font_rgb[0] + (bg_rgb[0] * (255 - font_rgb[0]))) >> 8; res_color.ch.red = (uint32_t)((uint32_t)txt_rgb[2] * font_rgb[2] + (bg_rgb[2] * (255 - font_rgb[2]))) >> 8; #else res_color.ch.red = (uint32_t)((uint16_t)txt_rgb[0] * font_rgb[0] + (bg_rgb[0] * (255 - font_rgb[0]))) >> 8; From 3f32911b90a4368f306c7a77490854e4fc598cab Mon Sep 17 00:00:00 2001 From: Amir Gonnen Date: Tue, 12 May 2020 01:08:50 +0300 Subject: [PATCH 3/3] Replace lv_point_t* to lv_point_t[] to represent point array Needed for Micropython Bindings to identify the argument as an array instead of a pointer to a single lv_point_t --- src/lv_draw/lv_draw_triangle.c | 4 ++-- src/lv_draw/lv_draw_triangle.h | 4 ++-- src/lv_widgets/lv_canvas.c | 4 ++-- src/lv_widgets/lv_canvas.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lv_draw/lv_draw_triangle.c b/src/lv_draw/lv_draw_triangle.c index b3f43106d..e52bc3913 100644 --- a/src/lv_draw/lv_draw_triangle.c +++ b/src/lv_draw/lv_draw_triangle.c @@ -40,7 +40,7 @@ * @param clip_area the triangle will be drawn only in this area * @param draw_dsc pointer to an initialized `lv_draw_rect_dsc_t` variable */ -void lv_draw_triangle(const lv_point_t * points, const lv_area_t * clip_area, lv_draw_rect_dsc_t * draw_dsc) +void lv_draw_triangle(const lv_point_t points[], const lv_area_t * clip_area, lv_draw_rect_dsc_t * draw_dsc) { lv_draw_polygon(points, 3, clip_area, draw_dsc); } @@ -52,7 +52,7 @@ void lv_draw_triangle(const lv_point_t * points, const lv_area_t * clip_area, lv * @param clip_area polygon will be drawn only in this area * @param draw_dsc pointer to an initialized `lv_draw_rect_dsc_t` variable */ -void lv_draw_polygon(const lv_point_t * points, uint16_t point_cnt, const lv_area_t * clip_area, +void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_area_t * clip_area, lv_draw_rect_dsc_t * draw_dsc) { if(point_cnt < 3) return; diff --git a/src/lv_draw/lv_draw_triangle.h b/src/lv_draw/lv_draw_triangle.h index 4bf7c6e32..242ce30f9 100644 --- a/src/lv_draw/lv_draw_triangle.h +++ b/src/lv_draw/lv_draw_triangle.h @@ -33,7 +33,7 @@ extern "C" { * @param clip_area the triangle will be drawn only in this area * @param draw_dsc pointer to an initialized `lv_draw_rect_dsc_t` variable */ -void lv_draw_triangle(const lv_point_t * points, const lv_area_t * clip, lv_draw_rect_dsc_t * draw_dsc); +void lv_draw_triangle(const lv_point_t points[], const lv_area_t * clip, lv_draw_rect_dsc_t * draw_dsc); /** * Draw a polygon. Only convex polygons are supported. @@ -42,7 +42,7 @@ void lv_draw_triangle(const lv_point_t * points, const lv_area_t * clip, lv_draw * @param clip_area polygon will be drawn only in this area * @param draw_dsc pointer to an initialized `lv_draw_rect_dsc_t` variable */ -void lv_draw_polygon(const lv_point_t * points, uint16_t point_cnt, const lv_area_t * mask, +void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_area_t * mask, lv_draw_rect_dsc_t * draw_dsc); /********************** diff --git a/src/lv_widgets/lv_canvas.c b/src/lv_widgets/lv_canvas.c index a5a681c3d..7e7b141da 100644 --- a/src/lv_widgets/lv_canvas.c +++ b/src/lv_widgets/lv_canvas.c @@ -895,7 +895,7 @@ void lv_canvas_draw_img(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, const voi * @param point_cnt number of points * @param style style of the line (`line` properties are used) */ -void lv_canvas_draw_line(lv_obj_t * canvas, const lv_point_t * points, uint32_t point_cnt, +void lv_canvas_draw_line(lv_obj_t * canvas, const lv_point_t points[], uint32_t point_cnt, lv_draw_line_dsc_t * line_draw_dsc) { LV_ASSERT_OBJ(canvas, LV_OBJX_NAME); @@ -958,7 +958,7 @@ void lv_canvas_draw_line(lv_obj_t * canvas, const lv_point_t * points, uint32_t * @param point_cnt number of points * @param style style of the polygon (`body.main_color` and `body.opa` is used) */ -void lv_canvas_draw_polygon(lv_obj_t * canvas, const lv_point_t * points, uint32_t point_cnt, +void lv_canvas_draw_polygon(lv_obj_t * canvas, const lv_point_t points[], uint32_t point_cnt, lv_draw_rect_dsc_t * poly_draw_dsc) { LV_ASSERT_OBJ(canvas, LV_OBJX_NAME); diff --git a/src/lv_widgets/lv_canvas.h b/src/lv_widgets/lv_canvas.h index 60de04c14..7d60855df 100644 --- a/src/lv_widgets/lv_canvas.h +++ b/src/lv_widgets/lv_canvas.h @@ -214,7 +214,7 @@ void lv_canvas_draw_img(lv_obj_t * canvas, lv_coord_t x, lv_coord_t y, const voi * @param point_cnt number of points * @param style style of the line (`line` properties are used) */ -void lv_canvas_draw_line(lv_obj_t * canvas, const lv_point_t * points, uint32_t point_cnt, +void lv_canvas_draw_line(lv_obj_t * canvas, const lv_point_t points[], uint32_t point_cnt, lv_draw_line_dsc_t * line_draw_dsc); /** @@ -224,7 +224,7 @@ void lv_canvas_draw_line(lv_obj_t * canvas, const lv_point_t * points, uint32_t * @param point_cnt number of points * @param style style of the polygon (`body.main_color` and `body.opa` is used) */ -void lv_canvas_draw_polygon(lv_obj_t * canvas, const lv_point_t * points, uint32_t point_cnt, +void lv_canvas_draw_polygon(lv_obj_t * canvas, const lv_point_t points[], uint32_t point_cnt, lv_draw_rect_dsc_t * poly_draw_dsc); /**