From a6d3eff4db282c3c74c578bf363ed2eb30fce5b4 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 12 Apr 2021 12:15:31 +0200 Subject: [PATCH] fix(draw_outline) do not change the outline_width based on the outline_pad fixes: #2171 --- src/draw/lv_draw_rect.c | 9 ++++----- src/extra/themes/default/lv_theme_default.c | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/draw/lv_draw_rect.c b/src/draw/lv_draw_rect.c index bd3098743..753f64096 100644 --- a/src/draw/lv_draw_rect.c +++ b/src/draw/lv_draw_rect.c @@ -1193,11 +1193,10 @@ static void draw_outline(const lv_area_t * coords, const lv_area_t * clip, const lv_area_t area_outer; lv_area_copy(&area_outer, &area_inner); - lv_coord_t width = (dsc->outline_pad == 0 ? (dsc->outline_width + 1) : dsc->outline_width); - area_outer.x1 -= width; - area_outer.x2 += width; - area_outer.y1 -= width; - area_outer.y2 += width; + area_outer.x1 -= dsc->outline_width; + area_outer.x2 += dsc->outline_width; + area_outer.y1 -= dsc->outline_width; + area_outer.y2 += dsc->outline_width; draw_full_border(&area_inner, &area_outer, clip, dsc->radius, true, dsc->outline_color, dsc->outline_opa, dsc->blend_mode); diff --git a/src/extra/themes/default/lv_theme_default.c b/src/extra/themes/default/lv_theme_default.c index afa87e1f9..a844c1ee6 100644 --- a/src/extra/themes/default/lv_theme_default.c +++ b/src/extra/themes/default/lv_theme_default.c @@ -32,7 +32,7 @@ static lv_color_t color_secondary_muted; #define TRANSITION_TIME LV_THEME_DEFAULT_TRANSITON_TIME #define BORDER_WIDTH LV_DPX(2) -#define OUTLINE_WIDTH LV_DPX(2) +#define OUTLINE_WIDTH LV_DPX(4) #define PAD_DEF (disp_size == DISP_LARGE ? LV_DPX(24) : disp_size == DISP_MEDIUM ? LV_DPX(20) : LV_DPX(20)) #define PAD_SMALL (disp_size == DISP_LARGE ? LV_DPX(14) : disp_size == DISP_MEDIUM ? LV_DPX(12) : LV_DPX(12))