Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00
Code Issues Projects Releases Wiki Activity

Compilation error fixes

Browse Source
This commit is contained in:
Alexander 2018-12-04 18:54:26 +02:00
parent efa9f0a5d1
commit 64a2a85077
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lv_core/lv_refr.c
View File

@ -514,7 +514,6 @@ static void lv_refr_obj(lv_obj_t * obj, const lv_area_t * mask_ori_p)
if(union_ok != false) { if(union_ok != false) {
/* Redraw the object */ /* Redraw the object */
lv_style_t * style = lv_obj_get_style(obj);
obj->design_func(obj, &obj_ext_mask, LV_DESIGN_DRAW_MAIN); obj->design_func(obj, &obj_ext_mask, LV_DESIGN_DRAW_MAIN);
//tick_wait_ms(100); /*DEBUG: Wait after every object draw to see the order of drawing*/ //tick_wait_ms(100); /*DEBUG: Wait after every object draw to see the order of drawing*/

2
lv_objx/lv_chart.c
View File

@ -731,7 +731,6 @@ static void lv_chart_draw_cols(lv_obj_t * chart, const lv_area_t * mask)
col_a.y2 = chart->coords.y2; col_a.y2 = chart->coords.y2;
lv_coord_t x_act; lv_coord_t x_act;
printf("\n", y_tmp);
/*Go through all points*/ /*Go through all points*/
for(i = 0; i < ext->point_cnt; i ++) { for(i = 0; i < ext->point_cnt; i ++) {
@ -749,7 +748,6 @@ static void lv_chart_draw_cols(lv_obj_t * chart, const lv_area_t * mask)
lv_coord_t p_act = (ser->start_point + i) % ext->point_cnt; lv_coord_t p_act = (ser->start_point + i) % ext->point_cnt;
y_tmp = (int32_t)((int32_t) ser->points[p_act] - ext->ymin) * h; y_tmp = (int32_t)((int32_t) ser->points[p_act] - ext->ymin) * h;
y_tmp = y_tmp / (ext->ymax - ext->ymin); y_tmp = y_tmp / (ext->ymax - ext->ymin);
printf("ytmp:%d\n", y_tmp);
col_a.y1 = h - y_tmp + chart->coords.y1; col_a.y1 = h - y_tmp + chart->coords.y1;
mask_ret = lv_area_intersect(&col_mask, mask, &col_a); mask_ret = lv_area_intersect(&col_mask, mask, &col_a);

5
lv_objx/lv_imgbtn.c
View File

@ -81,10 +81,11 @@ lv_obj_t * lv_imgbtn_create(lv_obj_t * par, const lv_obj_t * copy)
} }
/*Copy an existing image button*/ /*Copy an existing image button*/
else { else {
lv_imgbtn_ext_t * copy_ext = lv_obj_get_ext_attr(copy);
#if LV_IMGBTN_TILED == 0 #if LV_IMGBTN_TILED == 0
memset(ext->img_src, 0, sizeof(ext->img_src)); memset(ext->img_src, 0, sizeof(ext->img_src));
#else #else
lv_imgbtn_ext_t * copy_ext = lv_obj_get_ext_attr(copy);
memcpy(ext->img_src_left, copy_ext->img_src_left, sizeof(ext->img_src_left)); memcpy(ext->img_src_left, copy_ext->img_src_left, sizeof(ext->img_src_left));
memcpy(ext->img_src_mid, copy_ext->img_src_mid, sizeof(ext->img_src_mid)); memcpy(ext->img_src_mid, copy_ext->img_src_mid, sizeof(ext->img_src_mid));
memcpy(ext->img_src_right, copy_ext->img_src_right, sizeof(ext->img_src_right)); memcpy(ext->img_src_right, copy_ext->img_src_right, sizeof(ext->img_src_right));
@ -163,7 +164,7 @@ void lv_imgbtn_set_style(lv_obj_t * imgbtn, lv_imgbtn_style_t type, lv_style_t *
*/ */
const void * lv_imgbtn_get_src(lv_obj_t * imgbtn, lv_btn_state_t state) const void * lv_imgbtn_get_src(lv_obj_t * imgbtn, lv_btn_state_t state)
{ {
lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn); // lv_imgbtn_ext_t * ext = lv_obj_get_ext_attr(imgbtn);
return NULL;//ext->img_src[state]; return NULL;//ext->img_src[state];
} }