Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev-6.1

Browse Source
This commit is contained in:
Themba Dube 2019-08-06 09:13:27 -04:00
commit e53a30381a
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library.json
View File

@ -1,5 +1,6 @@
{ {
"name": "lvgl", "name": "lvgl",
"version": "6.0.1",
"keywords": "graphics, gui, embedded, littlevgl", "keywords": "graphics, gui, embedded, littlevgl",
"description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.", "description": "Graphics library to create embedded GUI with easy-to-use graphical elements, beautiful visual effects and low memory footprint. It offers anti-aliasing, opacity, and animations using only one frame buffer.",
"repository": "repository":

2
src/lv_objx/lv_calendar.c
View File

@ -787,7 +787,7 @@ static void draw_days(lv_obj_t * calendar, const lv_area_t * mask)
} }
label_area.x1 = label_area.x1 =
calendar->coords.x1 + (w * day) / 7 + style_bg->body.padding.left + style_bg->body.padding.right; calendar->coords.x1 + (w * day) / 7 + style_bg->body.padding.left;
label_area.x2 = label_area.x1 + box_w - 1; label_area.x2 = label_area.x1 + box_w - 1;
/*Draw the "today box"*/ /*Draw the "today box"*/

19
src/lv_objx/lv_chart.c
View File

@ -619,11 +619,20 @@ static bool lv_chart_design(lv_obj_t * chart, const lv_area_t * mask, lv_design_
lv_chart_draw_div(chart, mask); lv_chart_draw_div(chart, mask);
if(ext->type & LV_CHART_TYPE_LINE) lv_chart_draw_lines(chart, mask); /* Adjust the mask to remove the margin (clips chart contents to be within background) */
if(ext->type & LV_CHART_TYPE_COLUMN) lv_chart_draw_cols(chart, mask);
if(ext->type & LV_CHART_TYPE_POINT) lv_chart_draw_points(chart, mask); lv_area_t mask_tmp, adjusted_mask;
if(ext->type & LV_CHART_TYPE_VERTICAL_LINE) lv_chart_draw_vertical_lines(chart, mask); lv_obj_get_coords(chart, &mask_tmp);
if(ext->type & LV_CHART_TYPE_AREA) lv_chart_draw_areas(chart, mask);
bool union_ok = lv_area_intersect(&adjusted_mask, mask, &mask_tmp);
if(union_ok) {
if(ext->type & LV_CHART_TYPE_LINE) lv_chart_draw_lines(chart, &adjusted_mask);
if(ext->type & LV_CHART_TYPE_COLUMN) lv_chart_draw_cols(chart, &adjusted_mask);
if(ext->type & LV_CHART_TYPE_POINT) lv_chart_draw_points(chart, &adjusted_mask);
if(ext->type & LV_CHART_TYPE_VERTICAL_LINE) lv_chart_draw_vertical_lines(chart, &adjusted_mask);
if(ext->type & LV_CHART_TYPE_AREA) lv_chart_draw_areas(chart, &adjusted_mask);
}
lv_chart_draw_axes(chart, mask); lv_chart_draw_axes(chart, mask);
} }