Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-06-02 09:37:42 +08:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

lv draw corner: color mix bugfix and speed up

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2017-11-26 22:09:37 +01:00
parent 1d103f11c3
commit 84477fccee
1 changed files with 47 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lv_draw/lv_draw.c
+47 -17
View File
@@ -728,26 +728,39 @@ static void lv_draw_rect_main_corner(const lv_area_t * coords, const lv_area_t *
/*Draw the areas which are not disabled*/ /*Draw the areas which are not disabled*/
if(edge_top_refr != 0){ if(edge_top_refr != 0){
mix = (uint32_t)((uint32_t)(coords->y2 - edge_top_area.y1) * 255) / height; if(mcolor.full == gcolor.full) act_color = mcolor;
act_color = lv_color_mix(mcolor, gcolor, mix); else {
mix = (uint32_t)((uint32_t)(coords->y2 - edge_top_area.y1) * 255) / height;
act_color = lv_color_mix(mcolor, gcolor, mix);
}
fill_fp(&edge_top_area, mask, act_color, opa); fill_fp(&edge_top_area, mask, act_color, opa);
} }
if(mid_top_refr != 0) { if(mid_top_refr != 0) {
mix = (uint32_t)((uint32_t)(coords->y2 - mid_top_area.y1) * 255) / height; if(mcolor.full == gcolor.full) act_color = mcolor;
act_color = lv_color_mix(mcolor, gcolor, mix); else {
mix = (uint32_t)((uint32_t)(coords->y2 - mid_top_area.y1) * 255) / height;
act_color = lv_color_mix(mcolor, gcolor, mix);
}
fill_fp(&mid_top_area, mask, act_color, opa); fill_fp(&mid_top_area, mask, act_color, opa);
} }
if(mid_bot_refr != 0) { if(mid_bot_refr != 0) {
mix = (uint32_t)((uint32_t)(coords->y2 - mid_bot_area.y1) * 255) / height; if(mcolor.full == gcolor.full) act_color = mcolor;
act_color = lv_color_mix(mcolor, gcolor, mix); else {
mix = (uint32_t)((uint32_t)(coords->y2 - mid_bot_area.y1) * 255) / height;
act_color = lv_color_mix(mcolor, gcolor, mix);
}
fill_fp(&mid_bot_area, mask, act_color, opa); fill_fp(&mid_bot_area, mask, act_color, opa);
} }
if(edge_bot_refr != 0) { if(edge_bot_refr != 0) {
mix = (uint32_t)((uint32_t)(coords->y2 - edge_bot_area.y1) * 255) / height;
act_color = lv_color_mix(mcolor, gcolor, mix); if(mcolor.full == gcolor.full) act_color = mcolor;
else {
mix = (uint32_t)((uint32_t)(coords->y2 - edge_bot_area.y1) * 255) / height;
act_color = lv_color_mix(mcolor, gcolor, mix);
}
fill_fp(&edge_bot_area, mask, act_color, opa); fill_fp(&edge_bot_area, mask, act_color, opa);
} }
/*Save the current coordinates*/ /*Save the current coordinates*/
@@ -774,21 +787,38 @@ static void lv_draw_rect_main_corner(const lv_area_t * coords, const lv_area_t *
lv_circ_next(&cir, &cir_tmp); lv_circ_next(&cir, &cir_tmp);
} }
mix = (uint32_t)((uint32_t)(coords->y2 - edge_top_area.y1) * 255) / height;
act_color = lv_color_mix(mcolor, gcolor, mix); if(mcolor.full == gcolor.full) act_color = mcolor;
else {
mix = (uint32_t)((uint32_t)(coords->y2 - edge_top_area.y1) * 255) / height;
act_color = lv_color_mix(mcolor, gcolor, mix);
}
fill_fp(&edge_top_area, mask, act_color, opa); fill_fp(&edge_top_area, mask, act_color, opa);
if(edge_top_area.y1 != mid_top_area.y1) {
mix = (uint32_t)((uint32_t)(coords->y2 - mid_top_area.y1) * 255) / height; if(edge_top_area.y1 != mid_top_area.y1) {
act_color = lv_color_mix(mcolor, gcolor, mix);
if(mcolor.full == gcolor.full) act_color = mcolor;
else {
mix = (uint32_t)((uint32_t)(coords->y2 - mid_top_area.y1) * 255) / height;
act_color = lv_color_mix(mcolor, gcolor, mix);
}
fill_fp(&mid_top_area, mask, act_color, opa); fill_fp(&mid_top_area, mask, act_color, opa);
} }
mix = (uint32_t)((uint32_t)(coords->y2 - mid_bot_area.y1) * 255) / height;
act_color = lv_color_mix(mcolor, gcolor, mix); if(mcolor.full == gcolor.full) act_color = mcolor;
else {
mix = (uint32_t)((uint32_t)(coords->y2 - mid_bot_area.y1) * 255) / height;
act_color = lv_color_mix(mcolor, gcolor, mix);
}
fill_fp(&mid_bot_area, mask, act_color, opa); fill_fp(&mid_bot_area, mask, act_color, opa);
if(edge_bot_area.y1 != mid_bot_area.y1) { if(edge_bot_area.y1 != mid_bot_area.y1) {
mix = (uint32_t)((uint32_t)(coords->y2 - edge_bot_area.y1) * 255) / height;
act_color = lv_color_mix(mcolor, gcolor, mix); if(mcolor.full == gcolor.full) act_color = mcolor;
else {
mix = (uint32_t)((uint32_t)(coords->y2 - edge_bot_area.y1) * 255) / height;
act_color = lv_color_mix(mcolor, gcolor, mix);
}
fill_fp(&edge_bot_area, mask, act_color, opa); fill_fp(&edge_bot_area, mask, act_color, opa);
} }