From 81bfb765e5baba359e61dcb030f3ee96160a6335 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 4 Jan 2022 10:27:34 +0100 Subject: [PATCH] fix(draw): futher bg_img draw fixes --- src/core/lv_obj.c | 4 +++- src/draw/sw/lv_draw_sw_img.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c index a793d75d5..0b5f27a85 100644 --- a/src/core/lv_obj.c +++ b/src/core/lv_obj.c @@ -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); diff --git a/src/draw/sw/lv_draw_sw_img.c b/src/draw/sw/lv_draw_sw_img.c index 67dd583a4..40531a2d2 100644 --- a/src/draw/sw/lv_draw_sw_img.c +++ b/src/draw/sw/lv_draw_sw_img.c @@ -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;