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(spangroup): handle style_text_letter_space better (#6364)

Browse Source
This commit is contained in:
Liam 2024-06-21 04:43:09 -04:00 committed by GitHub
parent b56faf842f
commit 407d8b6ddf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/widgets/span/lv_span.c
View File

@ -479,7 +479,11 @@ int32_t lv_spangroup_get_expand_height(lv_obj_t * obj, int32_t width)
/* break word deal width */
if(isfill && next_ofs > 0 && snippet_cnt > 0) {
if(max_w < use_width) {
int32_t drawn_width = use_width;
if(_lv_ll_get_next(&spans->child_ll, cur_span) == NULL) {
drawn_width -= snippet.letter_space;
}
if(max_w < drawn_width) {
break;
}
@ -502,7 +506,7 @@ int32_t lv_spangroup_get_expand_height(lv_obj_t * obj, int32_t width)
max_line_h = snippet.line_h;
}
snippet_cnt ++;
max_w = max_w - use_width - snippet.letter_space;
max_w = max_w - use_width;
if(isfill || max_w <= 0) {
break;
}
@ -871,9 +875,13 @@ static void lv_draw_span(lv_obj_t * obj, lv_layer_t * layer)
if(isfill) {
if(next_ofs > 0 && lv_get_snippet_count() > 0) {
int32_t drawn_width = use_width;
if(_lv_ll_get_next(&spans->child_ll, cur_span) == NULL) {
drawn_width -= snippet.letter_space;
}
/* To prevent infinite loops, the lv_text_get_next_line() may return incomplete words, */
/* This phenomenon should be avoided when lv_get_snippet_count() > 0 */
if(max_w < use_width) {
if(max_w < drawn_width) {
break;
}
uint32_t tmp_ofs = next_ofs;
@ -898,7 +906,7 @@ static void lv_draw_span(lv_obj_t * obj, lv_layer_t * layer)
}
lv_snippet_push(&snippet);
max_w = max_w - use_width - snippet.letter_space;
max_w = max_w - use_width;
if(isfill || max_w <= 0) {
break;
}
@ -946,7 +954,7 @@ static void lv_draw_span(lv_obj_t * obj, lv_layer_t * layer)
uint32_t i;
for(i = 0; i < item_cnt; i++) {
lv_snippet_t * pinfo = lv_get_snippet(i);
txts_w = txts_w + pinfo->txt_w + pinfo->letter_space;
txts_w = txts_w + pinfo->txt_w;
}
txts_w -= lv_get_snippet(item_cnt - 1)->letter_space;
align_ofs = max_width > txts_w ? max_width - txts_w : 0;

BIN
tests/ref_imgs/widgets/span_08.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
tests/ref_imgs_vg_lite/widgets/span_08.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

18
tests/src/test_cases/widgets/test_span.c
View File

@ -356,4 +356,22 @@ void test_spangroup_chinese_break_line(void)
#endif
void test_spangroup_style_text_letter_space(void)
{
active_screen = lv_screen_active();
spangroup = lv_spangroup_create(active_screen);
lv_obj_set_style_outline_width(spangroup, 1, 0);
lv_obj_set_style_text_letter_space(spangroup, 20, 0);
lv_span_set_text(lv_spangroup_new_span(spangroup), "A");
lv_span_set_text(lv_spangroup_new_span(spangroup), "B");
lv_span_set_text(lv_spangroup_new_span(spangroup), "C");
lv_span_set_text(lv_spangroup_new_span(spangroup), "D");
lv_span_set_text(lv_spangroup_new_span(spangroup), "E");
lv_span_set_text(lv_spangroup_new_span(spangroup), "F");
TEST_ASSERT_EQUAL_SCREENSHOT("widgets/span_08.png");
}
#endif