Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00
Code Issues Projects Releases Wiki Activity

fix(draw_line): fix the issue where dash_dap equals 1 and cannot display properly when the line is a horizontal line (#5473)

Browse Source 
Signed-off-by: lhdjply <lhdjply@126.com>
This commit is contained in:
lhdjply 2024-01-25 18:15:13 +08:00 committed by GitHub
parent a7b767c780
commit e05e1f3c7a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/draw/sw/lv_draw_sw_line.c
View File

@ -152,7 +152,7 @@ static void LV_ATTRIBUTE_FAST_MEM draw_line_hor(lv_draw_unit_t * draw_unit, cons
i += diff;
dash_cnt += diff;
}
else if(dash_cnt >= dsc->dash_gap + dsc->dash_width) {
else if(dash_cnt > dsc->dash_gap + dsc->dash_width) {
dash_cnt = 0;
}
else {

BIN
tests/ref_imgs/widgets/line_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
tests/ref_imgs/widgets/line_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

35
tests/src/test_cases/widgets/test_line.c
View File

@ -110,4 +110,39 @@ void test_line_basic_render(void)
TEST_ASSERT_EQUAL_SCREENSHOT("widgets/line_1.png");
}
void test_line_dash_gap(void)
{
static lv_point_precise_t line_points1[3] = { {50, 50}, {250, 50}, {250, 250} };
static lv_point_precise_t line_points2[3] = { {50, 250}, {50, 50}, {250, 50} };
lv_obj_t * line1;
line1 = lv_line_create(lv_screen_active());
lv_line_set_points(line1, line_points1, 3);
lv_obj_set_style_line_width(line1, 1, LV_PART_MAIN);
lv_obj_set_style_line_dash_width(line1, 1, LV_PART_MAIN);
lv_obj_set_style_line_dash_gap(line1, 1, LV_PART_MAIN);
lv_obj_align(line1, LV_ALIGN_LEFT_MID, 0, 0);
lv_obj_t * line2;
line2 = lv_line_create(lv_screen_active());
lv_line_set_points(line2, line_points2, 3);
lv_obj_set_style_line_width(line2, 2, LV_PART_MAIN);
lv_obj_set_style_line_dash_width(line2, 2, LV_PART_MAIN);
lv_obj_set_style_line_dash_gap(line2, 2, LV_PART_MAIN);
lv_obj_center(line2);
lv_obj_t * line3;
line3 = lv_line_create(lv_screen_active());
lv_line_set_points(line3, line_points2, 3);
lv_obj_set_style_line_width(line3, 5, LV_PART_MAIN);
lv_obj_set_style_line_dash_width(line3, 3, LV_PART_MAIN);
lv_obj_set_style_line_dash_gap(line3, 1, LV_PART_MAIN);
lv_obj_align(line3, LV_ALIGN_RIGHT_MID, 0, 0);
TEST_ASSERT_EQUAL_SCREENSHOT("widgets/line_2.png");
}
#endif