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

add horizontal gradient main/grad_color_stop

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-09-11 06:47:52 +02:00
parent 777094cc81
commit 7d675cf1d1
20 changed files with 298 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
src/lv_draw/lv_draw_rect.c
View File

@@ -28,6 +28,7 @@
**********************/
static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_style_t * style, lv_opa_t opa_scale);
static void draw_shadow(const lv_area_t * coords, const lv_area_t * clip, const lv_style_t * style, lv_opa_t opa_scale);
static lv_color_t grad_get(const lv_style_t * style, lv_coord_t s, lv_coord_t i);
static void shadow_draw_corner_buf(const lv_area_t * coords, lv_opa_t * sh_buf, lv_coord_t s, lv_coord_t r);
static void shadow_blur_corner(lv_coord_t size, lv_coord_t sw, lv_opa_t * res_buf, uint16_t * sh_ups_buf);
@@ -80,7 +81,6 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
if(is_common == false) return;
const lv_area_t * disp_area = &vdb->area;
lv_color_t * disp_buf = vdb->buf_act;
/* Now `draw_area` has absolute coordinates.
* Make it relative to `disp_area` to simplify draw to `disp_buf`*/
@@ -92,18 +92,25 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
lv_coord_t draw_area_w = lv_area_get_width(&draw_area);
/*Create a mask if there is a radius*/
lv_opa_t mask_buf[LV_HOR_RES_MAX];
lv_opa_t * mask_buf = lv_draw_buf_get(draw_area_w);
bool simple_mode = true;
if(lv_draw_mask_get_cnt()!= 0) simple_mode = false;
else if(style->body.border.part != LV_BORDER_PART_FULL) simple_mode = false;
else if(style->body.grad_dir == LV_GRAD_DIR_HOR) simple_mode = false;
uint8_t other_mask_cnt = lv_draw_mask_get_cnt();
int16_t mask_rout_id = LV_MASK_ID_INV;
lv_coord_t coords_w = lv_area_get_width(coords);
lv_coord_t coords_h = lv_area_get_height(coords);
/*Get the real radius*/
lv_coord_t rout = style->body.radius;
lv_coord_t short_side = LV_MATH_MIN(lv_area_get_width(coords), lv_area_get_height(coords));
lv_coord_t short_side = LV_MATH_MIN(coords_w, coords_h);
if(rout > short_side >> 1) rout = short_side >> 1;
/*Most simple case: just a plain rectangle*/
if(other_mask_cnt == 0 && rout == 0 && style->body.main_color.full == style->body.grad_color.full) {
if(simple_mode && rout == 0 && style->body.main_color.full == style->body.grad_color.full) {
lv_blend_fill(clip, coords,
style->body.main_color, NULL, LV_DRAW_MASK_RES_FULL_COVER, style->body.opa,
style->body.blend_mode);
@@ -117,12 +124,24 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
mask_rout_id = lv_draw_mask_add(&mask_rout_param, NULL);
}
/*Draw the background line by line*/
lv_coord_t h;
lv_draw_mask_res_t mask_res = LV_DRAW_MASK_RES_FULL_COVER;
lv_color_t grad_color = style->body.main_color;
if(opa >= LV_OPA_MIN) {
/*Draw the background line by line*/
lv_coord_t h;
lv_draw_mask_res_t mask_res = LV_DRAW_MASK_RES_FULL_COVER;
lv_color_t grad_color = style->body.main_color;
lv_color_t * grad_map = NULL;
/*In case of horizontal gradient pre-compute a line with a gradient*/
if(style->body.grad_dir == LV_GRAD_DIR_HOR && style->body.main_color.full != style->body.grad_color.full) {
grad_map = lv_draw_buf_get(coords_w * sizeof(lv_color_t));
lv_coord_t i;
for(i = 0; i < coords_w; i++) {
grad_map[i] = grad_get(style, coords_w, i);
}
}
lv_area_t fill_area;
fill_area.x1 = coords->x1;
fill_area.x2 = coords->x2;
@@ -135,7 +154,7 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
if(y > coords->y1 + rout + 1 &&
y < coords->y2 - rout - 1) {
mask_res = LV_DRAW_MASK_RES_FULL_COVER;
if(other_mask_cnt != 0) {
if(simple_mode == false) {
memset(mask_buf, LV_OPA_COVER, draw_area_w);
mask_res = lv_draw_mask_apply(mask_buf, vdb->area.x1 + draw_area.x1, vdb->area.y1 + h, draw_area_w);
}
@@ -147,16 +166,15 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
}
/*Get the current line color*/
if(style->body.main_color.full != style->body.grad_color.full) {
lv_opa_t mix = (uint32_t)((uint32_t) (y - coords->y1) * 255) / lv_area_get_height(coords);
grad_color = lv_color_mix(style->body.grad_color, style->body.main_color, mix);
if(style->body.grad_dir == LV_GRAD_DIR_VER && style->body.main_color.full != style->body.grad_color.full) {
grad_color = grad_get(style, lv_area_get_height(coords), y - coords->y1);
}
/* If there is not other mask and drawing the corner area split the drawing to corner and middle areas
* because it the middle mask shuldn't be taken into account (therefore its faster)*/
if(other_mask_cnt == 0 &&
(y < coords->y1 + rout + 1 ||
y > coords->y2 - rout - 1)) {
if(simple_mode &&
(y < coords->y1 + rout + 1 ||
y > coords->y2 - rout - 1)) {
/*Left part*/
lv_area_t fill_area2;
@@ -184,12 +202,19 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
lv_blend_fill(clip, &fill_area2,
grad_color, mask_buf + mask_ofs, mask_res, style->body.opa, style->body.blend_mode);
} else {
lv_blend_fill(clip, &fill_area,
grad_color,mask_buf, mask_res, style->body.opa, style->body.blend_mode);
if(grad_map == NULL) {
lv_blend_fill(clip, &fill_area,
grad_color,mask_buf, mask_res, opa, style->body.blend_mode);
} else {
lv_blend_map(clip, &fill_area, grad_map, mask_buf, mask_res, opa, style->body.blend_mode);
}
}
fill_area.y1++;
fill_area.y2++;
}
if(grad_map) lv_draw_buf_release(grad_map);
}
}
@@ -209,10 +234,10 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
/*Get the inner area*/
lv_area_t area_small;
lv_area_copy(&area_small, coords);
area_small.x1 += border_width;
area_small.x2 -= border_width;
area_small.y1 += border_width;
area_small.y2 -= border_width;
area_small.x1 += ((style->body.border.part & LV_BORDER_PART_LEFT) ? border_width : 0);
area_small.x2 -= ((style->body.border.part & LV_BORDER_PART_RIGHT) ? border_width : 0);
area_small.y1 += ((style->body.border.part & LV_BORDER_PART_TOP) ? border_width : 0);
area_small.y2 -= ((style->body.border.part & LV_BORDER_PART_BOTTOM) ? border_width : 0);
/*Create the mask*/
lv_draw_mask_radius_init(&mask_rsmall_param, &area_small, rout - border_width, true);
@@ -225,9 +250,10 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
lv_area_t fill_area;
/*Apply some optimization if there is no other mask*/
if(other_mask_cnt == 0) {
if(simple_mode) {
/*Draw the upper corner area*/
lv_coord_t upper_corner_end = coords->y1 - disp_area->y1 + corner_size;
fill_area.x1 = coords->x1;
fill_area.x2 = coords->x2;
fill_area.y1 = disp_area->y1 + draw_area.y1;
@@ -237,15 +263,15 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
mask_res = lv_draw_mask_apply(mask_buf, vdb->area.x1 + draw_area.x1, vdb->area.y1 + h, draw_area_w);
lv_area_t fill_area2;
fill_area2.x1 = coords->x1;
fill_area2.x2 = coords->x1 + rout - 1;
fill_area2.y1 = fill_area.y1;
fill_area2.y2 = fill_area.y2;
fill_area2.x1 = coords->x1;
fill_area2.x2 = coords->x1 + rout - 1;
lv_blend_fill(clip, &fill_area2,
style->body.border.color, mask_buf, mask_res, style->body.border.opa, style->body.border.blend_mode);
if(fill_area2.y2 < coords->y1 + style->body.border.width) {
fill_area2.x1 = coords->x1 + rout;
fill_area2.x2 = coords->x2 - rout;
@@ -253,6 +279,7 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
lv_blend_fill(clip, &fill_area2,
style->body.border.color, NULL, LV_DRAW_MASK_RES_FULL_COVER, style->body.border.opa, style->body.border.blend_mode);
}
fill_area2.x1 = coords->x2 - rout + 1;
fill_area2.x2 = coords->x2;
@@ -266,50 +293,52 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
}
/*Draw the lower corner area corner area*/
lv_coord_t lower_corner_end = coords->y2 - disp_area->y1 - corner_size;
if(lower_corner_end <= upper_corner_end) lower_corner_end = upper_corner_end + 1;
fill_area.y1 = disp_area->y1 + lower_corner_end;
fill_area.y2 = fill_area.y1;
for(h = lower_corner_end; h <= draw_area.y2; h++) {
memset(mask_buf, LV_OPA_COVER, draw_area_w);
mask_res = lv_draw_mask_apply(mask_buf, vdb->area.x1 + draw_area.x1, vdb->area.y1 + h, draw_area_w);
if(style->body.border.part & LV_BORDER_PART_BOTTOM) {
lv_coord_t lower_corner_end = coords->y2 - disp_area->y1 - corner_size;
if(lower_corner_end <= upper_corner_end) lower_corner_end = upper_corner_end + 1;
fill_area.y1 = disp_area->y1 + lower_corner_end;
fill_area.y2 = fill_area.y1;
for(h = lower_corner_end; h <= draw_area.y2; h++) {
memset(mask_buf, LV_OPA_COVER, draw_area_w);
mask_res = lv_draw_mask_apply(mask_buf, vdb->area.x1 + draw_area.x1, vdb->area.y1 + h, draw_area_w);
lv_area_t fill_area2;
fill_area2.x1 = coords->x1;
fill_area2.x2 = coords->x1 + rout - 1;
fill_area2.y1 = fill_area.y1;
fill_area2.y2 = fill_area.y2;
lv_blend_fill(clip, &fill_area2,
style->body.border.color, mask_buf, mask_res, style->body.border.opa, style->body.border.blend_mode);
if(fill_area2.y2 > coords->y2 - style->body.border.width) {
fill_area2.x1 = coords->x1 + rout;
fill_area2.x2 = coords->x2 - rout;
lv_area_t fill_area2;
fill_area2.x1 = coords->x1;
fill_area2.x2 = coords->x1 + rout - 1;
fill_area2.y1 = fill_area.y1;
fill_area2.y2 = fill_area.y2;
lv_blend_fill(clip, &fill_area2,
style->body.border.color, NULL, LV_DRAW_MASK_RES_FULL_COVER, style->body.border.opa, style->body.border.blend_mode);
style->body.border.color, mask_buf, mask_res, style->body.border.opa, style->body.border.blend_mode);
if(fill_area2.y2 > coords->y2 - style->body.border.width ) {
fill_area2.x1 = coords->x1 + rout;
fill_area2.x2 = coords->x2 - rout;
lv_blend_fill(clip, &fill_area2,
style->body.border.color, NULL, LV_DRAW_MASK_RES_FULL_COVER, style->body.border.opa, style->body.border.blend_mode);
}
fill_area2.x1 = coords->x2 - rout + 1;
fill_area2.x2 = coords->x2;
lv_coord_t mask_ofs = (coords->x2 - rout + 1) - (vdb->area.x1 + draw_area.x1);
if(mask_ofs < 0) mask_ofs = 0;
lv_blend_fill(clip, &fill_area2,
style->body.border.color, mask_buf + mask_ofs, mask_res, style->body.border.opa, style->body.border.blend_mode);
fill_area.y1++;
fill_area.y2++;
}
fill_area2.x1 = coords->x2 - rout + 1;
fill_area2.x2 = coords->x2;
lv_coord_t mask_ofs = (coords->x2 - rout + 1) - (vdb->area.x1 + draw_area.x1);
if(mask_ofs < 0) mask_ofs = 0;
lv_blend_fill(clip, &fill_area2,
style->body.border.color, mask_buf + mask_ofs, mask_res, style->body.border.opa, style->body.border.blend_mode);
fill_area.y1++;
fill_area.y2++;
}
/*Draw the left vertical border part*/
fill_area.x1 = coords->x1;
fill_area.x2 = coords->x1 + border_width - 1;
fill_area.y1 = coords->y1 + corner_size + 1;
fill_area.y2 = coords->y2 - corner_size - 1;
fill_area.x1 = coords->x1;
fill_area.x2 = coords->x1 + border_width - 1;
lv_blend_fill(clip, &fill_area,
style->body.border.color, NULL, LV_DRAW_MASK_RES_FULL_COVER, style->body.border.opa, style->body.border.blend_mode);
@@ -342,9 +371,24 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
}
lv_draw_mask_remove_id(mask_rout_id);
lv_draw_buf_release(mask_buf);
}
static lv_color_t grad_get(const lv_style_t * style, lv_coord_t s, lv_coord_t i)
{
lv_coord_t min = (style->body.main_color_stop * s) >> 8;
if(i <= min) return style->body.main_color;
lv_coord_t max = (style->body.grad_color_stop * s) >> 8;
if(i >= max) return style->body.grad_color;
lv_coord_t d = style->body.grad_color_stop - style->body.main_color_stop;
d = (s * d) >> 8;
i -= min;
lv_opa_t mix = (i * 255) / d;
return lv_color_mix(style->body.grad_color, style->body.main_color, mix);
}
static void draw_shadow(const lv_area_t * coords, const lv_area_t * clip, const lv_style_t * style, lv_opa_t opa_scale)
{
@@ -387,7 +431,6 @@ static void draw_shadow(const lv_area_t * coords, const lv_area_t * clip, const
if(is_common == false) return;
const lv_area_t * disp_area = &vdb->area;
lv_color_t * disp_buf = vdb->buf_act;
/* Now `draw_area` has absolute coordinates.
* Make it relative to `disp_area` to simplify draw to `disp_buf`*/
@@ -396,14 +439,11 @@ static void draw_shadow(const lv_area_t * coords, const lv_area_t * clip, const
draw_area.x2 -= disp_area->x1;
draw_area.y2 -= disp_area->y1;
lv_coord_t draw_area_w = lv_area_get_width(&draw_area);
/*Get the real radius*/
lv_coord_t r_bg = style->body.radius;
lv_coord_t short_side = LV_MATH_MIN(lv_area_get_width(coords), lv_area_get_height(coords));
if(r_bg > short_side >> 1) r_bg = short_side >> 1;
lv_coord_t r_sh = style->body.radius;
short_side = LV_MATH_MIN(lv_area_get_width(&sh_rect_area), lv_area_get_height(&sh_rect_area));
if(r_sh > short_side >> 1) r_sh = short_side >> 1;
@@ -423,7 +463,7 @@ static void draw_shadow(const lv_area_t * coords, const lv_area_t * clip, const
/*Create a mask*/
lv_draw_mask_res_t mask_res;
lv_opa_t mask_buf[LV_HOR_RES_MAX];
lv_opa_t * mask_buf = lv_draw_buf_get(lv_area_get_width(&sh_rect_area));
lv_draw_mask_param_t mask_rout_param;
lv_draw_mask_radius_init(&mask_rout_param, coords, r_bg, true);
@@ -720,12 +760,11 @@ static void draw_shadow(const lv_area_t * coords, const lv_area_t * clip, const
}
lv_draw_mask_remove_id(mask_rout_id);
lv_draw_buf_release(mask_buf);
}
static void shadow_draw_corner_buf(const lv_area_t * coords, lv_opa_t * sh_buf, lv_coord_t sw, lv_coord_t r)
{
lv_coord_t sw_ori = sw;
lv_coord_t size = sw_ori + r;
@@ -739,7 +778,6 @@ static void shadow_draw_corner_buf(const lv_area_t * coords, lv_opa_t * sh_buf,
lv_draw_mask_param_t mask_param;
lv_draw_mask_radius_init(&mask_param, &sh_area, r, false);
// int16_t mask_id = lv_draw_mask_add(lv_mask_radius, &mask_param, NULL);
#if SHADOW_ENHANCE
/*Set half shadow width width because blur will be repeated*/
@@ -751,8 +789,8 @@ static void shadow_draw_corner_buf(const lv_area_t * coords, lv_opa_t * sh_buf,
lv_draw_mask_res_t mask_res;
lv_coord_t y;
lv_opa_t mask_line[size];
uint16_t sh_ups_buf[size*size];
lv_opa_t * mask_line = lv_draw_buf_get(size);
uint16_t * sh_ups_buf = lv_draw_buf_get(size * size * sizeof(uint16_t));
uint16_t * sh_ups_tmp_buf = sh_ups_buf;
for(y = 0; y < size; y++) {
memset(mask_line, 0xFF, size);
@@ -770,7 +808,7 @@ static void shadow_draw_corner_buf(const lv_area_t * coords, lv_opa_t * sh_buf,
sh_ups_tmp_buf += size;
}
lv_draw_buf_release(mask_line);
// uint32_t k;
// for(k = 0; k < size * size; k++) {
@@ -778,22 +816,23 @@ static void shadow_draw_corner_buf(const lv_area_t * coords, lv_opa_t * sh_buf,
// }
// return;
if(sw == 1) {
lv_coord_t i;
for(i = 0; i < size * size; i++) {
sh_buf[i] = (sh_ups_buf[i] >> SHADOW_UPSACALE_SHIFT);
}
lv_draw_buf_release(sh_ups_buf);
return;
}
shadow_blur_corner(size, sw, sh_buf, sh_ups_buf);
#if SHADOW_ENHANCE
sw = sw_ori - sw;
if(sw <= 1) return;
if(sw <= 1) {
lv_draw_buf_release(sh_ups_buf);
return;
}
uint32_t i;
sh_ups_buf[0] = (sh_buf[0] << SHADOW_UPSACALE_SHIFT) / sw;
@@ -805,17 +844,18 @@ static void shadow_draw_corner_buf(const lv_area_t * coords, lv_opa_t * sh_buf,
shadow_blur_corner(size, sw, sh_buf, sh_ups_buf);
#endif
lv_draw_buf_release(sh_ups_buf);
}
static void shadow_blur_corner(lv_coord_t size, lv_coord_t sw, lv_opa_t * res_buf, uint16_t * sh_ups_buf)
{
lv_coord_t s_left = sw >> 1;
lv_coord_t s_right = (sw >> 1);
if((sw & 1) == 0) s_left--;
/*Horizontal blur*/
uint16_t sh_ups_hor_buf[size*size];
uint16_t * sh_ups_hor_buf = lv_draw_buf_get(size * size * sizeof(uint16_t));
uint16_t * sh_ups_hor_buf_tmp;
lv_coord_t x;
@@ -826,7 +866,7 @@ static void shadow_blur_corner(lv_coord_t size, lv_coord_t sw, lv_opa_t * res_bu
for(y = 0; y < size; y++) {
int32_t v = sh_ups_tmp_buf[size-1] * sw;
for(x = size; x >=0; x--) {
for(x = size - 1; x >=0; x--) {
sh_ups_hor_buf_tmp[x] = v;
/*Forget the right pixel*/
@@ -848,16 +888,18 @@ static void shadow_blur_corner(lv_coord_t size, lv_coord_t sw, lv_opa_t * res_bu
/*Vertical blur*/
uint32_t i;
sh_ups_hor_buf[0] = sh_ups_hor_buf[0] / sw;
for(i = 1; i < size * size; i++) {
for(i = 1; i < (uint32_t)size * size; i++) {
if(sh_ups_hor_buf[i] == sh_ups_hor_buf[i-1]) sh_ups_hor_buf[i] = sh_ups_hor_buf[i-1];
else sh_ups_hor_buf[i] = sh_ups_hor_buf[i] / sw;
}
for(x = 0; x < size; x++) {
sh_ups_hor_buf_tmp = &sh_ups_hor_buf[x];
lv_opa_t * sh_buf_tmp = &res_buf[x];
int32_t v = sh_ups_hor_buf_tmp[0] * sw;
for(y = 0; y < size; y++, sh_ups_hor_buf_tmp += size, sh_buf_tmp += size) {
for(y = 0; y < size ; y++, sh_ups_hor_buf_tmp += size, sh_buf_tmp += size) {
sh_buf_tmp[0] = v < 0 ? 0 : (v >> SHADOW_UPSACALE_SHIFT);
/*Forget the top pixel*/
@@ -873,5 +915,7 @@ static void shadow_blur_corner(lv_coord_t size, lv_coord_t sw, lv_opa_t * res_bu
v += bottom_val;
}
}
lv_draw_buf_release(sh_ups_hor_buf);
}