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

Tidy up the edges of the colour picker widget.

Browse Source
This commit is contained in:
pete-pjb
2020-07-23 14:15:34 +01:00
parent 00e93a5d30
commit 28495b9eb9
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/lv_widgets/lv_cpicker.c
View File

@@ -491,11 +491,14 @@ static void draw_disc_grad(lv_obj_t * cpicker, const lv_area_t * mask)
line_dsc.color = angle_to_mode_color(cpicker, i);
lv_point_t p[2];
p[0].x = cx + (r * _lv_trigo_sin(i) >> LV_TRIGO_SHIFT);
p[0].y = cy + (r * _lv_trigo_sin(i + 90) >> LV_TRIGO_SHIFT);
p[1].x = cx + ((r - cir_w_extra) * _lv_trigo_sin(i) >> LV_TRIGO_SHIFT);
p[1].y = cy + ((r - cir_w_extra) * _lv_trigo_sin(i + 90) >> LV_TRIGO_SHIFT);
p[0].x = cx + ((r-2) * _lv_trigo_sin(i) >> LV_TRIGO_SHIFT);
p[0].y = cy + ((r-2) * _lv_trigo_sin(i + 90) >> LV_TRIGO_SHIFT);
p[1].x = cx + ((r-2 - cir_w_extra) * _lv_trigo_sin(i) >> LV_TRIGO_SHIFT);
p[1].y = cy + ((r-2 - cir_w_extra) * _lv_trigo_sin(i + 90) >> LV_TRIGO_SHIFT);
/* We use the r-2 value here to keep the lines inside the bounds of the circle as the integer based arithmetic
* is not a 100% using the trigonometric functions
*/
lv_draw_line(&p[0], &p[1], mask, &line_dsc);
}
@@ -524,6 +527,13 @@ static void draw_disc_grad(lv_obj_t * cpicker, const lv_area_t * mask)
area_mid.y2 -= inner;
lv_draw_rect(&area_mid, mask, &bg_dsc);
/*Tidy outside of colour picker, the way the outer ring has to be drawn it cannot mask well so this draws a clean edge around it */
lv_draw_line_dsc_t tidy_dsc;
lv_draw_line_dsc_init(&tidy_dsc);
tidy_dsc.width = 3;
tidy_dsc.color = lv_obj_get_style_bg_color(cpicker, LV_CPICKER_PART_MAIN);
lv_draw_arc(cx, cy, r, 0, 360, mask, &tidy_dsc);
}
static void draw_rect_grad(lv_obj_t * cpicker, const lv_area_t * mask)