Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-06-01 08:54:52 +08:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

fix(nxp-vglite): add missing '{' (#7365)

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2024-11-27 06:24:34 +01:00
committed by GitHub
parent 1a37c3eceb
commit c4275e8b8f
1 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/draw/nxp/vglite/lv_draw_vglite_label.c
+41 -42
View File
@@ -95,62 +95,61 @@ static void _draw_vglite_letter(lv_draw_unit_t * draw_unit, lv_draw_glyph_dsc_t
#endif #endif
} }
break; break;
case LV_FONT_GLYPH_FORMAT_A1 ... LV_FONT_GLYPH_FORMAT_A8_ALIGNED: case LV_FONT_GLYPH_FORMAT_A1 ... LV_FONT_GLYPH_FORMAT_A8_ALIGNED: {
/*Do not draw transparent things*/ /*Do not draw transparent things*/
if(glyph_draw_dsc->opa <= LV_OPA_MIN) if(glyph_draw_dsc->opa <= LV_OPA_MIN)
return; return;
lv_layer_t * layer = draw_unit->target_layer; lv_layer_t * layer = draw_unit->target_layer;
lv_area_t blend_area; lv_area_t blend_area;
if(!lv_area_intersect(&blend_area, glyph_draw_dsc->letter_coords, draw_unit->clip_area)) if(!lv_area_intersect(&blend_area, glyph_draw_dsc->letter_coords, draw_unit->clip_area))
return; return;
lv_area_move(&blend_area, -layer->buf_area.x1, -layer->buf_area.y1); lv_area_move(&blend_area, -layer->buf_area.x1, -layer->buf_area.y1);
const lv_draw_buf_t * draw_buf = lv_font_get_glyph_bitmap(glyph_draw_dsc->g, glyph_draw_dsc->_draw_buf); const lv_draw_buf_t * draw_buf = lv_font_get_glyph_bitmap(glyph_draw_dsc->g, glyph_draw_dsc->_draw_buf);
const void * mask_buf = draw_buf->data; const void * mask_buf = draw_buf->data;
uint32_t mask_width = lv_area_get_width(glyph_draw_dsc->letter_coords); uint32_t mask_width = lv_area_get_width(glyph_draw_dsc->letter_coords);
uint32_t mask_height = lv_area_get_height(glyph_draw_dsc->letter_coords); uint32_t mask_height = lv_area_get_height(glyph_draw_dsc->letter_coords);
uint32_t mask_stride = draw_buf->header.stride; uint32_t mask_stride = draw_buf->header.stride;
lv_area_t mask_area; lv_area_t mask_area;
mask_area.x1 = blend_area.x1 - (glyph_draw_dsc->letter_coords->x1 - layer->buf_area.x1); mask_area.x1 = blend_area.x1 - (glyph_draw_dsc->letter_coords->x1 - layer->buf_area.x1);
mask_area.y1 = blend_area.y1 - (glyph_draw_dsc->letter_coords->y1 - layer->buf_area.y1); mask_area.y1 = blend_area.y1 - (glyph_draw_dsc->letter_coords->y1 - layer->buf_area.y1);
mask_area.x2 = mask_width - 1; mask_area.x2 = mask_width - 1;
mask_area.y2 = mask_height - 1; mask_area.y2 = mask_height - 1;
/* Set src_vgbuf structure. */ /* Set src_vgbuf structure. */
vglite_set_src_buf(mask_buf, mask_width, mask_height, mask_stride, LV_COLOR_FORMAT_A8); vglite_set_src_buf(mask_buf, mask_width, mask_height, mask_stride, LV_COLOR_FORMAT_A8);
/* Set vgmatrix. */ /* Set vgmatrix. */
vglite_set_translation_matrix(&blend_area); vglite_set_translation_matrix(&blend_area);
lv_draw_buf_invalidate_cache(draw_buf, &mask_area); lv_draw_buf_invalidate_cache(draw_buf, &mask_area);
_vglite_draw_letter(&mask_area, glyph_draw_dsc->color, glyph_draw_dsc->opa); _vglite_draw_letter(&mask_area, glyph_draw_dsc->color, glyph_draw_dsc->opa);
} }
break; break;
case LV_FONT_GLYPH_FORMAT_IMAGE: { case LV_FONT_GLYPH_FORMAT_IMAGE: {
#if LV_USE_IMGFONT #if LV_USE_IMGFONT
glyph_draw_dsc->glyph_data = lv_font_get_glyph_bitmap(glyph_draw_dsc->g, glyph_draw_dsc->_draw_buf); glyph_draw_dsc->glyph_data = lv_font_get_glyph_bitmap(glyph_draw_dsc->g, glyph_draw_dsc->_draw_buf);
lv_draw_image_dsc_t img_dsc; lv_draw_image_dsc_t img_dsc;
lv_draw_image_dsc_init(&img_dsc); lv_draw_image_dsc_init(&img_dsc);
img_dsc.opa = glyph_draw_dsc->opa; img_dsc.opa = glyph_draw_dsc->opa;
img_dsc.src = glyph_draw_dsc->glyph_data; img_dsc.src = glyph_draw_dsc->glyph_data;
lv_draw_vglite_img(draw_unit, &img_dsc, glyph_draw_dsc->letter_coords); lv_draw_vglite_img(draw_unit, &img_dsc, glyph_draw_dsc->letter_coords);
#endif #endif
}
break;
default:
break;
} }
break;
default:
break;
} }
}
if(fill_draw_dsc && fill_area) if(fill_draw_dsc && fill_area) {
{ lv_draw_vglite_fill(draw_unit, fill_draw_dsc, fill_area);
lv_draw_vglite_fill(draw_unit, fill_draw_dsc, fill_area); }
}
} }
static void _vglite_draw_letter(const lv_area_t * mask_area, lv_color_t color, lv_opa_t opa) static void _vglite_draw_letter(const lv_area_t * mask_area, lv_color_t color, lv_opa_t opa)