From 4ad256f00ead6969e2b436948ea1fe9ec6a1de6a Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Wed, 5 Feb 2020 15:41:25 +0100 Subject: [PATCH] minor fixes --- src/lv_core/lv_refr.c | 12 ++---------- src/lv_objx/lv_arc.c | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/lv_core/lv_refr.c b/src/lv_core/lv_refr.c index c925b9412..fd2c053f1 100644 --- a/src/lv_core/lv_refr.c +++ b/src/lv_core/lv_refr.c @@ -533,23 +533,15 @@ static void lv_refr_obj(lv_obj_t * obj, const lv_area_t * mask_ori_p) #if MASK_AREA_DEBUG static lv_color_t debug_color = LV_COLOR_RED; -<<<<<<< HEAD lv_draw_rect_dsc_t draw_dsc; lv_draw_rect_dsc_init(&draw_dsc); draw_dsc.bg_color.full = debug_color.full; - draw_dsc.bg_opa = LV_OPA_50; + draw_dsc.bg_opa = LV_OPA_20; draw_dsc.border_width = 2; + draw_dsc.border_opa = LV_OPA_50; draw_dsc.border_color.full = (debug_color.full + 0x13) * 9; lv_draw_rect(&obj_ext_mask, &obj_ext_mask, &draw_dsc); -======= - LV_STYLE_CREATE(style_debug, &lv_style_plain); - style_debug.body.main_color = debug_color; - style_debug.body.grad_color = debug_color; - style_debug.body.border.width = 2; - style_debug.body.border.color.full = (debug_color.full + 0x13) * 9; - lv_draw_rect(&obj_ext_mask, &obj_ext_mask, &style_debug, LV_OPA_20); ->>>>>>> dev-7.0 debug_color.full *= 17; debug_color.full += 0xA1; #if LV_COLOR_DEPTH == 32 diff --git a/src/lv_objx/lv_arc.c b/src/lv_objx/lv_arc.c index 5b865c23e..807138d36 100644 --- a/src/lv_objx/lv_arc.c +++ b/src/lv_objx/lv_arc.c @@ -361,7 +361,7 @@ static void inv_arc_area(lv_obj_t * arc, uint16_t start_angle, uint16_t end_angl lv_style_int_t w = lv_obj_get_style_line_width(arc, LV_ARC_PART_ARC); lv_style_int_t rounded = lv_obj_get_style_line_rounded(arc, LV_ARC_PART_ARC); lv_coord_t rin = rout - w; - lv_coord_t extra_area = rounded ? w : 0; + lv_coord_t extra_area = rounded ? w / 2 + 2 : 0; lv_area_t inv_area;