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

merge calendar

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2018-06-08 09:51:11 +02:00
parent f9f542e7e3 c17df70f8e
commit f2d380ce96
12 changed files with 1113 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lv_draw/lv_draw.c
View File

@@ -119,4 +119,3 @@ static void (*map_fp)(const lv_area_t * cords_p, const lv_area_t * mask_p,
}
#endif

2
lv_draw/lv_draw_line.c
View File

@@ -14,8 +14,6 @@
/*********************
* DEFINES
*********************/
#define LINE_WIDTH_CORR_BASE 64
#define LINE_WIDTH_CORR_SHIFT 6
#if LV_COMPILER_VLA_SUPPORTED == 0
#define LINE_MAX_WIDTH 64
#endif

40
lv_draw/lv_draw_rect.c
View File

@@ -482,6 +482,46 @@ static void lv_draw_rect_border_straight(const lv_area_t * coords, const lv_area
corner_size = radius + LV_ANTIALIAS;
}
/*If radius == 0 is a special case*/
if(style->body.radius == 0) {
/*Left top corner*/
if(part & LV_BORDER_TOP) {
work_area.x1 = coords->x1;
work_area.x2 = coords->x2;
work_area.y1 = coords->y1;
work_area.y2 = coords->y1 + bwidth;
fill_fp(&work_area, mask, color, opa);
}
/*Right top corner*/
if(part & LV_BORDER_RIGHT) {
work_area.x1 = coords->x2 - bwidth;
work_area.x2 = coords->x2;
work_area.y1 = coords->y1 + (part & LV_BORDER_TOP ? bwidth + 1 : 0);
work_area.y2 = coords->y2 - (part & LV_BORDER_BOTTOM ? bwidth + 1 : 0);
fill_fp(&work_area, mask, color, opa);
}
/*Left bottom corner*/
if(part & LV_BORDER_LEFT) {
work_area.x1 = coords->x1;
work_area.x2 = coords->x1 + bwidth;
work_area.y1 = coords->y1 + (part & LV_BORDER_TOP ? bwidth + 1 : 0);
work_area.y2 = coords->y2 - (part & LV_BORDER_BOTTOM ? bwidth + 1 : 0);
fill_fp(&work_area, mask, color, opa);
}
/*Right bottom corner*/
if(part & LV_BORDER_BOTTOM) {
work_area.x1 = coords->x1;
work_area.x2 = coords->x2;
work_area.y1 = coords->y2 - bwidth;
work_area.y2 = coords->y2;
fill_fp(&work_area, mask, color, opa);
}
return;
}
/* Modify the corner_size if corner is drawn */
corner_size ++;