8000 fix(span): handle trailing newline by EDGEMTech-GabrielC · Pull Request #8440 · lvgl/lvgl · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
8000

fix(span): handle trailing newline #8440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: release/v8.4
Choose a base branch
from
Open

fix(span): handle trailing newline #8440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2aca89f
fix(span): handle trailing newline
EDGEMTech-GabrielC Jun 17, 2025
38b9fd1
fix(span): add tests for span widget
EDGEMTech-GabrielC Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/extra/widgets/span/lv_span.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ static bool lv_txt_get_snippet(const char * txt, const lv_font_t * font,
uint32_t ofs = _lv_txt_get_next_line(txt, font, letter_space, max_width, use_width, flag);
*end_ofs = ofs;

if(txt[ofs] == '\0' && *use_width < max_width) {
if(txt[ofs] == '\0' && *use_width < max_width && !(ofs && (txt[ofs - 1] == '\n' || txt[ofs - 1] == '\r'))) {
return false;
}
else {
Expand Down
258 changes: 258 additions & 0 deletions tests/src/test_cases/test_span.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,258 @@
#if LV_BUILD_TEST
#include "../lvgl.h"

#include "unity/unity.h"

static lv_obj_t * spangroup = NULL;
static lv_obj_t * active_screen = NULL;

void setUp(void)
{
spangroup = lv_spangroup_create(NULL);
}

void tearDown(void)
{
lv_obj_del(spangroup);

if(active_screen) {
lv_obj_clean(active_screen);
}

spangroup = NULL;
active_screen = NULL;
}

void test_spangroup_create_returns_not_null_object(void)
{
lv_obj_t * obj = lv_spangroup_create(NULL);

TEST_ASSERT(NULL != obj);
}

void test_spangroup_new_span_with_null_parameter_returns_null_object(void)
{
lv_span_t * span = lv_spangroup_new_span(NULL);

TEST_ASSERT(NULL == span);
TEST_ASSERT_EQUAL_INT(0, lv_spangroup_get_child_cnt(spangroup));
}

void test_spangroup_new_span_with_valid_parameter_returns_not_null_object(void)
{
lv_span_t * span = lv_spangroup_new_span(spangroup);

TEST_ASSERT(NULL != span);
TEST_ASSERT_EQUAL_INT(1, lv_spangroup_get_child_cnt(spangroup));
}

void test_spangroup_delete_span_span_is_null(void)
{
lv_span_t * span = lv_spangroup_new_span(spangroup);

lv_spangroup_del_span(spangroup, span);

TEST_ASSERT_EQUAL_INT(0, lv_spangroup_get_child_cnt(spangroup));
}

void test_span_set_text(void)
{
const char * test_text = "Test Text";
lv_span_t * span = lv_spangroup_new_span(spangroup);

lv_span_set_text(span, test_text);

TEST_ASSERT_EQUAL_STRING(span->txt, test_text);
}

void test_span_set_text_with_bad_parameter_no_action_performed(void)
{
const char * test_text = "Test Text";
lv_span_t * span = lv_spangroup_new_span(spangroup);

lv_span_set_text(span, test_text);
lv_span_set_text(span, NULL);

TEST_ASSERT_EQUAL_STRING(span->txt, test_text);
}

void test_span_set_text_with_previous_test_overwrites(void)
{
const char * old_test_text = "Old Test Text";
const char * new_test_text = "New Test Text and it is longer";
lv_span_t * span = lv_spangroup_new_span(spangroup);

lv_span_set_text(span, old_test_text);
lv_span_set_text(span, new_test_text);

TEST_ASSERT_EQUAL_STRING(span->txt, new_test_text);
}

void test_span_set_text_static(void)
{
const char * test_text = "Test Text";
lv_span_t * span = lv_spangroup_new_span(spangroup);

lv_span_set_text_static(span, test_text);

TEST_ASSERT_EQUAL_STRING(span->txt, test_text);
}

void test_span_set_text_static_with_bad_parameter_no_action_performed(void)
{
const char * test_text = "Test Text";
lv_span_t * span = lv_spangroup_new_span(spangroup);

lv_span_set_text_static(span, test_text);
lv_span_set_text_static(span, NULL);

TEST_ASSERT_EQUAL_STRING(span->txt, test_text);
}

void test_span_set_text_static_with_previous_text_overwrites(void)
{
const char * old_test_text = "Old Test Text";
const char * new_test_text = "New Test Text and it is longer";
lv_span_t * span = lv_spangroup_new_span(spangroup);
lv_span_set_text_static(span, old_test_text);
lv_span_set_text_static(span, new_test_text);

TEST_ASSERT_EQUAL_STRING(span->txt, new_test_text);
}

void test_spangroup_set_align(void)
{
const lv_text_align_t align = LV_TEXT_ALIGN_CENTER;
lv_spangroup_set_align(spangroup, align);

TEST_ASSERT_EQUAL(align, lv_spangroup_get_align(spangroup));
}

void test_spangroup_set_overflow(void)
{
const lv_span_overflow_t overflow = LV_SPAN_OVERFLOW_ELLIPSIS;
lv_spangroup_set_overflow(spangroup, overflow);

TEST_ASSERT_EQUAL(overflow, lv_spangroup_get_overflow(spangroup));
}

void test_spangroup_set_indent(void)
{
const int32_t indent = 100;

lv_spangroup_set_indent(spangroup, indent);

TEST_ASSERT_EQUAL(indent, lv_spangroup_get_indent(spangroup));
}

void test_spangroup_set_mode(void)
{
lv_spangroup_set_mode(spangroup, LV_SPAN_MODE_EXPAND);
TEST_ASSERT_EQUAL(LV_SPAN_MODE_EXPAND, lv_spangroup_get_mode(spangroup));

lv_spangroup_set_mode(spangroup, LV_SPAN_MODE_BREAK);
TEST_ASSERT_EQUAL(LV_SPAN_MODE_BREAK, lv_spangroup_get_mode(spangroup));

lv_spangroup_set_mode(spangroup, LV_SPAN_MODE_FIXED);
TEST_ASSERT_EQUAL(LV_SPAN_MODE_FIXED, lv_spangroup_get_mode(spangroup));
}

void test_spangroup_draw(void)
{
active_screen = lv_scr_act();
spangroup = lv_spangroup_create(active_screen);
lv_spangroup_set_mode(spangroup, LV_SPAN_MODE_BREAK);
lv_obj_set_width(spangroup, 100);
lv_span_t * span_1 = lv_spangroup_new_span(spangroup);
lv_span_set_text(span_1, "This text is over 100 pixels width");

TEST_ASSERT_EQUAL_SCREENSHOT("widgets/span_01.png");

lv_span_t * span_2 = lv_spangroup_new_span(spangroup);
lv_span_set_text(span_2, "This text is also over 100 pixels width");
lv_style_set_text_decor(&span_2->style, LV_TEXT_DECOR_STRIKETHROUGH);

TEST_ASSERT_EQUAL_SCREENSHOT("widgets/span_02.png");

lv_spangroup_set_align(spangroup, LV_TEXT_ALIGN_CENTER);

TEST_ASSERT_EQUAL_SCREENSHOT("widgets/span_03.png");

lv_spangroup_set_mode(spangroup, LV_SPAN_MODE_EXPAND);

TEST_ASSERT_EQUAL_SCREENSHOT("widgets/span_04.png");

lv_spangroup_set_mode(spangroup, LV_SPAN_MODE_FIXED);

TEST_ASSERT_EQUAL_SCREENSHOT("widgets/span_05.png");
}

void test_spangroup_get_child(void)
{
const int32_t span_1_idx = 0;
const int32_t span_2_idx = 1;
lv_span_t * span_1 = lv_spangroup_new_span(spangroup);
lv_span_t * span_2 = lv_spangroup_new_span(spangroup);

TEST_ASSERT_EQUAL_PTR(span_2, lv_spangroup_get_child(spangroup, span_2_idx));
TEST_ASSERT_EQUAL_PTR(span_1, lv_spangroup_get_child(spangroup, span_1_idx));
}

void test_spangroup_get_child_count(void)
{
(void)lv_spangroup_new_span(spangroup);
(void)lv_spangroup_new_span(spangroup);

const uint32_t cnt = lv_spangroup_get_child_cnt(spangroup);

TEST_ASSERT_EQUAL(2, cnt);
}

void test_spangroup_get_expand_width(void)
{
const uint32_t experimental_size = 232;
const uint32_t constrained_size = 232;
active_screen = lv_scr_act();

spangroup = lv_spangroup_create(active_screen);
lv_span_t * span = lv_spangroup_new_span(spangroup);
lv_span_set_text(span, "This text is over 100 pixels width");

TEST_ASSERT_EQUAL_INT(experimental_size,
lv_spangroup_get_expand_width(spangroup, UINT32_MAX));

TEST_ASSERT_EQUAL_INT(constrained_size,
lv_spangroup_get_expand_width(spangroup, experimental_size));
}

void test_spangroup_newlines(void)
{
active_screen = lv_scr_act();
spangroup = lv_spangroup_create(active_screen);
lv_obj_set_size(spangroup, LV_PCT(100), LV_PCT(100));

lv_span_set_text(lv_spangroup_new_span(spangroup), "Lorem\n");
lv_span_set_text(lv_spangroup_new_span(spangroup), "ipsum");

lv_span_set_text(lv_spangroup_new_span(spangroup), "\n\n");

lv_span_set_text(lv_spangroup_new_span(spangroup), "dolor");
lv_span_set_text(lv_spangroup_new_span(spangroup), "");
lv_span_set_text(lv_spangroup_new_span(spangroup), "\nsit");

/* carriage return is treated as equivalent to line feed */
lv_span_set_text(lv_spangroup_new_span(spangroup), "\r");

lv_span_set_text(lv_spangroup_new_span(spangroup), "amet,\n consectetur");
lv_span_set_text(lv_spangroup_new_span(spangroup), " adipiscing");

lv_span_set_text(lv_spangroup_new_span(spangroup), "\n");
lv_span_set_text(lv_spangroup_new_span(spangroup), "");

lv_span_set_text(lv_spangroup_new_span(spangroup), "\relit, sed\n");
lv_span_set_text(lv_spangroup_new_span(spangroup), "do eiusmod");

TEST_ASSERT_EQUAL_SCREENSHOT("widgets/span_06.png");
}

#endif
Loading
0