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

run formatter

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-03-03 15:37:13 +01:00
parent b1f059375d
commit 2f44d9045b
16 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lv_draw/lv_draw_rect.c
View File

@@ -511,20 +511,19 @@ static void draw_border(const lv_area_t * coords, const lv_area_t * clip, lv_dra
if(dsc->border_side == LV_BORDER_SIDE_TOP) top_only = true;
if(dsc->border_side == LV_BORDER_SIDE_BOTTOM) bottom_only = true;
if(dsc->border_side == (LV_BORDER_SIDE_TOP | LV_BORDER_SIDE_BOTTOM)) {
top_only = true;
bottom_only = true;
top_only = true;
bottom_only = true;
}
volatile bool normal = !top_only && !bottom_only ? true : false;
for(h = draw_area.y1; h <= draw_area.y2; h++) {
if(normal ||
(top_only && fill_area.y1 <= coords->y1 + corner_size) ||
(bottom_only && fill_area.y1 >= coords->y2 - corner_size))
{
memset(mask_buf, LV_OPA_COVER, draw_area_w);
mask_res = lv_draw_mask_apply(mask_buf, vdb->area.x1 + draw_area.x1, vdb->area.y1 + h, draw_area_w);
lv_blend_fill(clip, &fill_area, color, mask_buf, mask_res, opa, blend_mode);
(top_only && fill_area.y1 <= coords->y1 + corner_size) ||
(bottom_only && fill_area.y1 >= coords->y2 - corner_size)) {
memset(mask_buf, LV_OPA_COVER, draw_area_w);
mask_res = lv_draw_mask_apply(mask_buf, vdb->area.x1 + draw_area.x1, vdb->area.y1 + h, draw_area_w);
lv_blend_fill(clip, &fill_area, color, mask_buf, mask_res, opa, blend_mode);
}
fill_area.y1++;
fill_area.y2++;