From 7ab421ed30fdc679895d8db0a86c39b44d0feee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BA=A2=E6=A1=83=E5=85=AD?=
 <49054754+HongChao6@users.noreply.github.com>
Date: Tue, 21 Jan 2025 17:33:26 +0800
Subject: [PATCH] fix(span): fix align text to center and right layout issues.
 (#7615)

Signed-off-by: liuhongchao <liuhongchao@xiaomi.com>
---
 src/widgets/span/lv_span.c                 |   6 ++++++
 tests/ref_imgs/widgets/span_10.png         | Bin 0 -> 3684 bytes
 tests/ref_imgs_vg_lite/widgets/span_10.png | Bin 0 -> 3703 bytes
 tests/src/test_cases/widgets/test_span.c   |  19 +++++++++++++++++++
 4 files changed, 25 insertions(+)
 create mode 100644 tests/ref_imgs/widgets/span_10.png
 create mode 100644 tests/ref_imgs_vg_lite/widgets/span_10.png

diff --git a/src/widgets/span/lv_span.c b/src/widgets/span/lv_span.c
index e7ece397c..e2d40ebe6 100644
--- a/src/widgets/span/lv_span.c
+++ b/src/widgets/span/lv_span.c
@@ -1041,6 +1041,12 @@ 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);
+                if(ellipsis_valid && i == item_cnt - 1) {
+                    uint32_t n_ofs = 0;
+                    lv_text_get_snippet(pinfo->txt, pinfo->font, pinfo->letter_space, max_width - txts_w,
+                                        LV_TEXT_FLAG_BREAK_ALL, &pinfo->txt_w, &n_ofs);
+                    pinfo->bytes = n_ofs;
+                }
                 txts_w = txts_w + pinfo->txt_w;
             }
             txts_w -= lv_get_snippet(item_cnt - 1)->letter_space;
diff --git a/tests/ref_imgs/widgets/span_10.png b/tests/ref_imgs/widgets/span_10.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce0049c328a2a68121ab9695037f71d112631852
GIT binary patch
literal 3684
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
U^_p+MuSbB-%E^@cvFyfw0mJe5_5c6?

literal 0
HcmV?d00001

diff --git a/tests/ref_imgs_vg_lite/widgets/span_10.png b/tests/ref_imgs_vg_lite/widgets/span_10.png
new file mode 100644
index 0000000000000000000000000000000000000000..84c3bda1546d3b4f124ac1a74e4f4c77823d16bd
GIT binary patch
literal 3703
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

literal 0
HcmV?d00001

diff --git a/tests/src/test_cases/widgets/test_span.c b/tests/src/test_cases/widgets/test_span.c
index 5cbc8c223..ff4666a0d 100644
--- a/tests/src/test_cases/widgets/test_span.c
+++ b/tests/src/test_cases/widgets/test_span.c
@@ -479,4 +479,23 @@ void test_spangroup_get_span_coords(void)
 }
 #endif
 
+void test_spangroup_set_right_align_on_overflow(void)
+{
+    active_screen = lv_screen_active();
+    spangroup = lv_spangroup_create(active_screen);
+
+    lv_obj_set_style_outline_width(spangroup, 1, 0);
+
+    lv_obj_set_width(spangroup, 180);
+    lv_obj_set_height(spangroup, 20);
+
+    lv_spangroup_set_align(spangroup, LV_TEXT_ALIGN_RIGHT);
+
+    lv_span_t * span = lv_spangroup_new_span(spangroup);
+    lv_span_set_text_static(span, "China is a beautiful country.");
+    lv_spangroup_set_overflow(spangroup, LV_SPAN_OVERFLOW_ELLIPSIS);
+
+    TEST_ASSERT_EQUAL_SCREENSHOT("widgets/span_10.png");
+}
+
 #endif