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

fix(draw): futher bg_img draw fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2022-01-04 10:27:34 +01:00
parent c63fb1c593
commit 81bfb765e5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/lv_obj.c
View File

@@ -536,7 +536,9 @@ static void lv_obj_draw(lv_event_t * e)
/*With clip corner enabled draw the bg img separately to make it clipped*/
bool clip_corner = (lv_obj_get_style_clip_corner(obj, LV_PART_MAIN) && draw_dsc.radius != 0) ? true : false;
const void * bg_img_src = draw_dsc.bg_img_src;
draw_dsc.bg_img_src = NULL;
if(clip_corner) {
draw_dsc.bg_img_src = NULL;
}
#endif
lv_draw_rect(draw_ctx, &draw_dsc, &coords);

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

@@ -272,7 +272,7 @@ LV_ATTRIBUTE_FAST_MEM void lv_draw_sw_img_decoded(struct _lv_draw_ctx_t * draw_c
if(mask_any) {
lv_draw_mask_res_t mask_res_sub;
mask_res_sub = lv_draw_mask_apply(mask_buf + px_i_start, blend_area.x1,
y + blend_area.y1, draw_area_w);
y + draw_area.y1, draw_area_w);
if(mask_res_sub == LV_DRAW_MASK_RES_TRANSP) {
lv_memset_00(mask_buf + px_i_start, draw_area_w);
blend_dsc.mask_res = LV_DRAW_MASK_RES_CHANGED;