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

draw rect optimization

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-08-28 16:33:05 +02:00
parent 3d72e3915b
commit cfc5260912
2 changed files with 57 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_core/lv_style.c
View File

@ -163,14 +163,14 @@ void lv_style_init(void)
lv_style_copy(&lv_style_btn_rel, &lv_style_plain); lv_style_copy(&lv_style_btn_rel, &lv_style_plain);
lv_style_btn_rel.body.main_color = lv_color_make(0x76, 0xa2, 0xd0); lv_style_btn_rel.body.main_color = lv_color_make(0x76, 0xa2, 0xd0);
lv_style_btn_rel.body.grad_color = lv_color_make(0x19, 0x3a, 0x5d); lv_style_btn_rel.body.grad_color = lv_color_make(0x19, 0x3a, 0x5d);
lv_style_btn_rel.body.radius = 200;//LV_DPI / 15; lv_style_btn_rel.body.radius = LV_DPI / 15;
lv_style_btn_rel.body.padding.left = LV_DPI / 4; lv_style_btn_rel.body.padding.left = LV_DPI / 4;
lv_style_btn_rel.body.padding.right = LV_DPI / 4; lv_style_btn_rel.body.padding.right = LV_DPI / 4;
lv_style_btn_rel.body.padding.top = LV_DPI / 6; lv_style_btn_rel.body.padding.top = LV_DPI / 6;
lv_style_btn_rel.body.padding.bottom = LV_DPI / 6; lv_style_btn_rel.body.padding.bottom = LV_DPI / 6;
lv_style_btn_rel.body.padding.inner = LV_DPI / 10; lv_style_btn_rel.body.padding.inner = LV_DPI / 10;
lv_style_btn_rel.body.border.color = lv_color_make(0x0b, 0x19, 0x28); lv_style_btn_rel.body.border.color = lv_color_make(0x0b, 0x19, 0x28);
lv_style_btn_rel.body.border.width = LV_DPI / 50 >= 1 ? LV_DPI / 50 : 1; lv_style_btn_rel.body.border.width = 3;//LV_DPI / 50 >= 1 ? LV_DPI / 50 : 1;
lv_style_btn_rel.body.border.opa = LV_OPA_70; lv_style_btn_rel.body.border.opa = LV_OPA_70;
lv_style_btn_rel.body.shadow.color = LV_COLOR_GRAY; lv_style_btn_rel.body.shadow.color = LV_COLOR_GRAY;
lv_style_btn_rel.body.shadow.width = 0; lv_style_btn_rel.body.shadow.width = 0;

61
src/lv_draw/lv_draw_rect.c
View File

@ -178,7 +178,6 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
fill_area2.x2 = coords->x2; fill_area2.x2 = coords->x2;
lv_coord_t mask_ofs = (coords->x2 - rout) - (vdb->area.x1 + draw_area.x1); lv_coord_t mask_ofs = (coords->x2 - rout) - (vdb->area.x1 + draw_area.x1);
printf("mask_ofs:%d, draw_w:%d\n", mask_ofs, draw_area_w);
if(mask_ofs < 0) mask_ofs = 0; if(mask_ofs < 0) mask_ofs = 0;
lv_blend_fill(disp_area, clip, &fill_area2, lv_blend_fill(disp_area, clip, &fill_area2,
disp_buf, LV_IMG_CF_TRUE_COLOR, grad_color, disp_buf, LV_IMG_CF_TRUE_COLOR, grad_color,
@ -216,7 +215,7 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
lv_mask_radius_init(&mask_rsmall_param, &area_small, rout - border_width, true); lv_mask_radius_init(&mask_rsmall_param, &area_small, rout - border_width, true);
int16_t mask_rsmall_id = lv_mask_add(lv_mask_radius, &mask_rsmall_param, NULL); int16_t mask_rsmall_id = lv_mask_add(lv_mask_radius, &mask_rsmall_param, NULL);
lv_coord_t corner_size = LV_MATH_MAX(rout, border_width); lv_coord_t corner_size = LV_MATH_MAX(rout, border_width - 1);
lv_coord_t h; lv_coord_t h;
lv_mask_res_t mask_res; lv_mask_res_t mask_res;
@ -234,10 +233,34 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
memset(mask_buf, LV_OPA_COVER, draw_area_w); memset(mask_buf, LV_OPA_COVER, draw_area_w);
mask_res = lv_mask_apply(mask_buf, vdb->area.x1 + draw_area.x1, vdb->area.y1 + h, draw_area_w); mask_res = lv_mask_apply(mask_buf, vdb->area.x1 + draw_area.x1, vdb->area.y1 + h, draw_area_w);
lv_blend_fill(disp_area, clip, &fill_area, lv_area_t fill_area2;
fill_area2.x1 = coords->x1;
fill_area2.x2 = coords->x1 + rout;
fill_area2.y1 = fill_area.y1;
fill_area2.y2 = fill_area.y2;
lv_blend_fill(disp_area, clip, &fill_area2,
disp_buf, LV_IMG_CF_TRUE_COLOR, style->body.border.color, disp_buf, LV_IMG_CF_TRUE_COLOR, style->body.border.color,
mask_buf, mask_res, style->body.border.opa, LV_BLIT_MODE_NORMAL); mask_buf, mask_res, style->body.border.opa, LV_BLIT_MODE_NORMAL);
if(fill_area2.y2 < coords->y1 + style->body.border.width) {
fill_area2.x1 = coords->x1 + rout + 1;
fill_area2.x2 = coords->x2 - rout - 1;
lv_blend_fill(disp_area, clip, &fill_area2,
disp_buf, LV_IMG_CF_TRUE_COLOR, style->body.border.color,
NULL, LV_MASK_RES_FULL_COVER, style->body.border.opa, LV_BLIT_MODE_NORMAL);
}
fill_area2.x1 = coords->x2 - rout;
fill_area2.x2 = coords->x2;
lv_coord_t mask_ofs = (coords->x2 - rout) - (vdb->area.x1 + draw_area.x1);
if(mask_ofs < 0) mask_ofs = 0;
lv_blend_fill(disp_area, clip, &fill_area2,
disp_buf, LV_IMG_CF_TRUE_COLOR, style->body.border.color,
mask_buf + mask_ofs, mask_res, style->body.border.opa, LV_BLIT_MODE_NORMAL);
fill_area.y1++; fill_area.y1++;
fill_area.y2++; fill_area.y2++;
} }
@ -251,9 +274,34 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
memset(mask_buf, LV_OPA_COVER, draw_area_w); memset(mask_buf, LV_OPA_COVER, draw_area_w);
mask_res = lv_mask_apply(mask_buf, vdb->area.x1 + draw_area.x1, vdb->area.y1 + h, draw_area_w); mask_res = lv_mask_apply(mask_buf, vdb->area.x1 + draw_area.x1, vdb->area.y1 + h, draw_area_w);
lv_blend_fill(disp_area, clip, &fill_area, lv_area_t fill_area2;
disp_buf, LV_IMG_CF_TRUE_COLOR, style->body.border.color, fill_area2.x1 = coords->x1;
mask_buf, mask_res, style->body.border.opa, LV_BLIT_MODE_NORMAL); fill_area2.x2 = coords->x1 + rout;
fill_area2.y1 = fill_area.y1;
fill_area2.y2 = fill_area.y2;
lv_blend_fill(disp_area, clip, &fill_area2,
disp_buf, LV_IMG_CF_TRUE_COLOR, style->body.border.color,
mask_buf, mask_res, style->body.border.opa, LV_BLIT_MODE_NORMAL);
if(fill_area2.y2 > coords->y2 - style->body.border.width) {
fill_area2.x1 = coords->x1 + rout + 1;
fill_area2.x2 = coords->x2 - rout - 1;
lv_blend_fill(disp_area, clip, &fill_area2,
disp_buf, LV_IMG_CF_TRUE_COLOR, style->body.border.color,
NULL, LV_MASK_RES_FULL_COVER, style->body.border.opa, LV_BLIT_MODE_NORMAL);
}
fill_area2.x1 = coords->x2 - rout;
fill_area2.x2 = coords->x2;
lv_coord_t mask_ofs = (coords->x2 - rout) - (vdb->area.x1 + draw_area.x1);
if(mask_ofs < 0) mask_ofs = 0;
lv_blend_fill(disp_area, clip, &fill_area2,
disp_buf, LV_IMG_CF_TRUE_COLOR, style->body.border.color,
mask_buf + mask_ofs, mask_res, style->body.border.opa, LV_BLIT_MODE_NORMAL);
fill_area.y1++; fill_area.y1++;
fill_area.y2++; fill_area.y2++;
@ -269,6 +317,7 @@ static void draw_bg(const lv_area_t * coords, const lv_area_t * clip, const lv_s
disp_buf, LV_IMG_CF_TRUE_COLOR, style->body.border.color, disp_buf, LV_IMG_CF_TRUE_COLOR, style->body.border.color,
NULL, LV_MASK_RES_FULL_COVER, style->body.border.opa, LV_BLIT_MODE_NORMAL); NULL, LV_MASK_RES_FULL_COVER, style->body.border.opa, LV_BLIT_MODE_NORMAL);
/*Draw the right vertical border*/
fill_area.x1 = coords->x2 - border_width + 1; fill_area.x1 = coords->x2 - border_width + 1;
fill_area.x2 = coords->x2; fill_area.x2 = coords->x2;