Fix accidental truncation when multi-byte runes had ellipsis trunc

Fixes #4283
fyne-io · Oct 3, 2023 · ac32047 · ac32047
1 parent df6e029
commit ac32047
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/widget/richtext.go b/widget/richtext.go
@@ -1017,8 +1017,8 @@ func lineBounds(seg *TextSegment, wrap fyne.TextWrap, trunc fyne.TextTruncation,
 			}
 		default:
 			if trunc == fyne.TextTruncateEllipsis {
-				txt := seg.Text[low:high]
-				end, full := truncateLimit(txt, seg.Visual().(*canvas.Text), int(measureWidth), []rune{'…'})
+				txt := []rune(seg.Text)[low:high]
+				end, full := truncateLimit(string(txt), seg.Visual().(*canvas.Text), int(measureWidth), []rune{'…'})
 				high = low + end
 				bounds = append(bounds, rowBoundary{[]RichTextSegment{seg}, reuse, low, high, !full})
 				reuse++

diff --git a/widget/richtext_test.go b/widget/richtext_test.go
@@ -969,6 +969,16 @@ func TestText_lineBounds(t *testing.T) {
 			},
 			ellipses: 1,
 		},
+		{
+			name:  "Multi_byte_ellipsis_not_truncated",
+			text:  "🪃 234",
+			trunc: fyne.TextTruncateEllipsis,
+			wrap:  fyne.TextWrapOff,
+			want: [][2]int{
+				{0, 5},
+			},
+			ellipses: 0,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {