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 'dev-7.0' of https://github.com/littlevgl/lvgl into dev-7.0

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-03-03 15:36:54 +01:00
commit b1f059375d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_draw/lv_draw_mask.c
View File

@ -382,7 +382,7 @@ void lv_draw_mask_radius_init(lv_draw_mask_radius_param_t * param, const lv_area
* @param opa_bottom opacity at the bottom * @param opa_bottom opacity at the bottom
* @param y_bottom at which coordinate reach `opa_bottom`. * @param y_bottom at which coordinate reach `opa_bottom`.
*/ */
void lv_draw_mask_fade_init(lv_draw_mask_fade_param_t * param, lv_area_t * coords, lv_opa_t opa_top, lv_coord_t y_top, void lv_draw_mask_fade_init(lv_draw_mask_fade_param_t * param, const lv_area_t * coords, lv_opa_t opa_top, lv_coord_t y_top,
lv_opa_t opa_bottom, lv_coord_t y_bottom) lv_opa_t opa_bottom, lv_coord_t y_bottom)
{ {
lv_area_copy(&param->cfg.coords, coords); lv_area_copy(&param->cfg.coords, coords);
@ -401,7 +401,7 @@ void lv_draw_mask_fade_init(lv_draw_mask_fade_param_t * param, lv_area_t * coord
* @param coords coordinates of the map (absolute coordinates) * @param coords coordinates of the map (absolute coordinates)
* @param map array of bytes with the mask values * @param map array of bytes with the mask values
*/ */
void lv_draw_mask_map_init(lv_draw_mask_map_param_t * param, lv_area_t * coords, const lv_opa_t * map) void lv_draw_mask_map_init(lv_draw_mask_map_param_t * param, const lv_area_t * coords, const lv_opa_t * map)
{ {
lv_area_copy(&param->cfg.coords, coords); lv_area_copy(&param->cfg.coords, coords);
param->cfg.map = map; param->cfg.map = map;

4
src/lv_draw/lv_draw_mask.h
View File

@ -257,7 +257,7 @@ void lv_draw_mask_radius_init(lv_draw_mask_radius_param_t * param, const lv_area
* @param opa_bottom opacity at the bottom * @param opa_bottom opacity at the bottom
* @param y_bottom at which coordinate reach `opa_bottom`. * @param y_bottom at which coordinate reach `opa_bottom`.
*/ */
void lv_draw_mask_fade_init(lv_draw_mask_fade_param_t * param, lv_area_t * coords, lv_opa_t opa_top, lv_coord_t y_top, void lv_draw_mask_fade_init(lv_draw_mask_fade_param_t * param, const lv_area_t * coords, lv_opa_t opa_top, lv_coord_t y_top,
lv_opa_t opa_bottom, lv_coord_t y_bottom); lv_opa_t opa_bottom, lv_coord_t y_bottom);
/** /**
@ -266,7 +266,7 @@ void lv_draw_mask_fade_init(lv_draw_mask_fade_param_t * param, lv_area_t * coord
* @param coords coordinates of the map (absolute coordinates) * @param coords coordinates of the map (absolute coordinates)
* @param map array of bytes with the mask values * @param map array of bytes with the mask values
*/ */
void lv_draw_mask_map_init(lv_draw_mask_map_param_t * param, lv_area_t * coords, const lv_opa_t * map); void lv_draw_mask_map_init(lv_draw_mask_map_param_t * param, const lv_area_t * coords, const lv_opa_t * map);
/********************** /**********************
* MACROS * MACROS

4
src/lv_widgets/lv_chart.c
View File

@ -803,8 +803,8 @@ static void draw_series_line(lv_obj_t * chart, const lv_area_t * series_area, co
has_fade = area_dsc.bg_grad_dir == LV_GRAD_DIR_VER ? true : false; has_fade = area_dsc.bg_grad_dir == LV_GRAD_DIR_VER ? true : false;
if(has_fade) { if(has_fade) {
lv_draw_mask_fade_init(&mask_fade_p, &chart->coords, area_dsc.bg_main_color_stop, chart->coords.y1, lv_draw_mask_fade_init(&mask_fade_p, series_area, area_dsc.bg_main_color_stop, series_area->y1,
area_dsc.bg_grad_color_stop, chart->coords.y2); area_dsc.bg_grad_color_stop, series_area->y2);
} }
} }