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

fix(draw_label): radius Mask doesn't work in Specific condition (#2784)

Browse Source
This commit is contained in:
guoweilkd 2021-11-12 19:24:26 +08:00 committed by GitHub
parent ab544696dc
commit fa6e49df5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/draw/lv_draw_label.c
View File

@ -549,7 +549,10 @@ LV_ATTRIBUTE_FAST_MEM static void draw_letter_normal(lv_coord_t pos_x, lv_coord_
fill_area.y1 = row_start + pos_y; fill_area.y1 = row_start + pos_y;
fill_area.y2 = fill_area.y1; fill_area.y2 = fill_area.y1;
#if LV_DRAW_COMPLEX #if LV_DRAW_COMPLEX
bool mask_any = lv_draw_mask_is_any(&fill_area); lv_area_t mask_area;
lv_area_copy(&mask_area, &fill_area);
mask_area.y2 = mask_area.y1 + row_end;
bool mask_any = lv_draw_mask_is_any(&mask_area);
#endif #endif
uint32_t col_bit_max = 8 - bpp; uint32_t col_bit_max = 8 - bpp;
@ -705,6 +708,9 @@ static void draw_letter_subpx(lv_coord_t pos_x, lv_coord_t pos_y, lv_font_glyph_
/*If the letter is partially out of mask the move there on draw_buf*/ /*If the letter is partially out of mask the move there on draw_buf*/
disp_buf_buf_tmp += (row_start * disp_buf_width) + col_start / 3; disp_buf_buf_tmp += (row_start * disp_buf_width) + col_start / 3;
lv_area_t mask_area;
lv_area_copy(&mask_area, &map_area);
mask_area.y2 = mask_area.y1 + row_end;
bool mask_any = lv_draw_mask_is_any(&map_area); bool mask_any = lv_draw_mask_is_any(&map_area);
uint8_t font_rgb[3]; uint8_t font_rgb[3];