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

multi-disp: API updates

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-02-20 10:16:33 +01:00
parent ef8563c9bd 8581a249bd
commit f2bd701927
57 changed files with 2035 additions and 1396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lv_draw/lv_draw_basic.c
View File

@@ -79,7 +79,7 @@ void lv_draw_px(lv_coord_t x, lv_coord_t y, const lv_area_t * mask_p, lv_color_t
}
lv_disp_t * disp = lv_refr_get_disp_refreshing();
lv_vdb_t * vdb = lv_disp_get_vdb(disp);
lv_disp_buf_t * vdb = lv_disp_get_vdb(disp);
uint32_t vdb_width = lv_area_get_width(&vdb->area);
/*Make the coordinates relative to VDB*/
@@ -129,7 +129,7 @@ void lv_draw_fill(const lv_area_t * cords_p, const lv_area_t * mask_p,
if(union_ok == false) return;
lv_disp_t * disp = lv_refr_get_disp_refreshing();
lv_vdb_t * vdb = lv_disp_get_vdb(disp);
lv_disp_buf_t * vdb = lv_disp_get_vdb(disp);
lv_area_t vdb_rel_a; /*Stores relative coordinates on vdb*/
vdb_rel_a.x1 = res_a.x1 - vdb->area.x1;
@@ -290,7 +290,7 @@ void lv_draw_letter(const lv_point_t * pos_p, const lv_area_t * mask_p,
pos_y + letter_h < mask_p->y1 || pos_y > mask_p->y2) return;
lv_disp_t * disp = lv_refr_get_disp_refreshing();
lv_vdb_t * vdb = lv_disp_get_vdb(disp);
lv_disp_buf_t * vdb = lv_disp_get_vdb(disp);
lv_coord_t vdb_width = lv_area_get_width(&vdb->area);
lv_color_t * vdb_buf_tmp = vdb->buf_act;
@@ -409,7 +409,7 @@ void lv_draw_map(const lv_area_t * cords_p, const lv_area_t * mask_p,
}
lv_disp_t * disp = lv_refr_get_disp_refreshing();
lv_vdb_t * vdb = lv_disp_get_vdb(disp);
lv_disp_buf_t * vdb = lv_disp_get_vdb(disp);
/*Stores coordinates relative to the current VDB*/
masked_a.x1 = masked_a.x1 - vdb->area.x1;

16
lv_draw/lv_draw_label.c
View File

@@ -77,6 +77,14 @@ void lv_draw_label(const lv_area_t * coords, const lv_area_t * mask, const lv_st
pos.x = coords->x1;
pos.y = coords->y1;
lv_coord_t x_ofs = 0;
lv_coord_t y_ofs = 0;
if(offset != NULL) {
x_ofs = offset->x;
y_ofs = offset->y;
pos.y += y_ofs;
}
uint32_t line_start = 0;
uint32_t line_end = lv_txt_get_next_line(txt, font, style->text.letter_space, w, flag);
@@ -114,14 +122,6 @@ void lv_draw_label(const lv_area_t * coords, const lv_area_t * mask, const lv_st
lv_color_t recolor;
lv_coord_t letter_w;
lv_coord_t x_ofs = 0;
lv_coord_t y_ofs = 0;
if(offset != NULL) {
x_ofs = offset->x;
y_ofs = offset->y;
pos.y += y_ofs;
}
/*Write out all lines*/
while(txt[line_start] != '\0') {
if(offset != NULL) {