From 0c6d0d48a3f4229a3d5321c683590cdc53bf0ee4 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Wed, 6 May 2020 20:08:46 +0200 Subject: [PATCH] run code formater --- src/lv_draw/lv_draw_blend.c | 2 +- src/lv_draw/lv_draw_rect.c | 10 +++++----- src/lv_widgets/lv_arc.c | 4 ++-- src/lv_widgets/lv_bar.c | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lv_draw/lv_draw_blend.c b/src/lv_draw/lv_draw_blend.c index e7e32a4ff..5bf1ed6ae 100644 --- a/src/lv_draw/lv_draw_blend.c +++ b/src/lv_draw/lv_draw_blend.c @@ -94,7 +94,7 @@ static inline lv_color_t color_blend_true_color_subtractive(lv_color_t fg, lv_co if(*mask_tmp_x) { \ if(*mask_tmp_x == LV_OPA_COVER) disp_buf_first[x] = map_buf_first[x]; \ else if(disp->driver.screen_transp) lv_color_mix_with_alpha(disp_buf_first[x], disp_buf_first[x].ch.alpha, \ - map_buf_first[x], *mask_tmp_x, &disp_buf_first[x], &disp_buf_first[x].ch.alpha); \ + map_buf_first[x], *mask_tmp_x, &disp_buf_first[x], &disp_buf_first[x].ch.alpha); \ else disp_buf_first[x] = lv_color_mix(map_buf_first[x], disp_buf_first[x], *mask_tmp_x); \ } \ mask_tmp_x++; diff --git a/src/lv_draw/lv_draw_rect.c b/src/lv_draw/lv_draw_rect.c index 010b7ae4a..06edd3e72 100644 --- a/src/lv_draw/lv_draw_rect.c +++ b/src/lv_draw/lv_draw_rect.c @@ -34,11 +34,11 @@ LV_ATTRIBUTE_FAST_MEM static void draw_border(const lv_area_t * coords, const lv static void draw_outline(const lv_area_t * coords, const lv_area_t * clip, lv_draw_rect_dsc_t * dsc); LV_ATTRIBUTE_FAST_MEM static inline lv_color_t grad_get(lv_draw_rect_dsc_t * dsc, lv_coord_t s, lv_coord_t i); #if LV_USE_SHADOW - LV_ATTRIBUTE_FAST_MEM static void draw_shadow(const lv_area_t * coords, const lv_area_t * clip, - lv_draw_rect_dsc_t * dsc); - LV_ATTRIBUTE_FAST_MEM static void shadow_draw_corner_buf(const lv_area_t * coords, uint16_t * sh_buf, lv_coord_t s, - lv_coord_t r); - LV_ATTRIBUTE_FAST_MEM static void shadow_blur_corner(lv_coord_t size, lv_coord_t sw, uint16_t * sh_ups_buf); +LV_ATTRIBUTE_FAST_MEM static void draw_shadow(const lv_area_t * coords, const lv_area_t * clip, + lv_draw_rect_dsc_t * dsc); +LV_ATTRIBUTE_FAST_MEM static void shadow_draw_corner_buf(const lv_area_t * coords, uint16_t * sh_buf, lv_coord_t s, + lv_coord_t r); +LV_ATTRIBUTE_FAST_MEM static void shadow_blur_corner(lv_coord_t size, lv_coord_t sw, uint16_t * sh_ups_buf); #endif static void draw_pattern(const lv_area_t * coords, const lv_area_t * clip, lv_draw_rect_dsc_t * dsc); static void draw_value(const lv_area_t * coords, const lv_area_t * clip, lv_draw_rect_dsc_t * dsc); diff --git a/src/lv_widgets/lv_arc.c b/src/lv_widgets/lv_arc.c index 7ff9be517..c10b0f5d3 100644 --- a/src/lv_widgets/lv_arc.c +++ b/src/lv_widgets/lv_arc.c @@ -421,8 +421,8 @@ static lv_design_res_t lv_arc_design(lv_obj_t * arc, const lv_area_t * clip_area lv_coord_t r = (LV_MATH_MIN(lv_obj_get_width(arc) - left_bg - right_bg, lv_obj_get_height(arc) - top_bg - bottom_bg)) / 2; lv_draw_line_dsc_t arc_dsc; - lv_coord_t x = arc->coords.x1 + r + left_bg; - lv_coord_t y = arc->coords.y1 + r + top_bg; + lv_coord_t x = arc->coords.x1 + r + left_bg; + lv_coord_t y = arc->coords.y1 + r + top_bg; if(r > 0) { lv_draw_line_dsc_init(&arc_dsc); diff --git a/src/lv_widgets/lv_bar.c b/src/lv_widgets/lv_bar.c index 4eb13e958..1baad09c4 100644 --- a/src/lv_widgets/lv_bar.c +++ b/src/lv_widgets/lv_bar.c @@ -408,9 +408,9 @@ static void draw_bg(lv_obj_t * bar, const lv_area_t * clip_area) lv_draw_rect_dsc_t draw_dsc; lv_draw_rect_dsc_init(&draw_dsc); /*If the border is drawn later disable loading its properties*/ - if(lv_obj_get_style_border_post(bar, LV_BAR_PART_BG)) { - draw_dsc.border_opa = LV_OPA_TRANSP; - } + if(lv_obj_get_style_border_post(bar, LV_BAR_PART_BG)) { + draw_dsc.border_opa = LV_OPA_TRANSP; + } lv_obj_init_draw_rect_dsc(bar, LV_BAR_PART_BG, &draw_dsc); lv_draw_rect(&bar->coords, clip_area, &draw_dsc);