Merge pull request #92745 from bruvzg/rtl_list_fix

[RTL] Fix nested ordered lists inside unordered lists.
godotengine · Jun 4, 2024 · 7c2d65f · 7c2d65f
2 parents 0242e3c + 5e616ce
commit 7c2d65f
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
@@ -690,25 +690,32 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
 	_find_list(l.from, list_index, list_items);
 
 	String prefix;
+	int segments = 0;
 	for (int i = 0; i < list_index.size(); i++) {
+		String segment;
+		if (list_items[i]->list_type == LIST_DOTS) {
+			if (segments == 0) {
+				prefix = list_items[i]->bullet;
+			}
+			break;
+		}
 		if (rtl) {
 			prefix = prefix + ".";
 		} else {
 			prefix = "." + prefix;
 		}
-		String segment;
-		if (list_items[i]->list_type == LIST_DOTS) {
-			prefix = list_items[i]->bullet;
-			break;
-		} else if (list_items[i]->list_type == LIST_NUMBERS) {
+		if (list_items[i]->list_type == LIST_NUMBERS) {
 			segment = itos(list_index[i]);
 			if (is_localizing_numeral_system()) {
 				segment = TS->format_number(segment, _find_language(l.from));
 			}
+			segments++;
 		} else if (list_items[i]->list_type == LIST_LETTERS) {
 			segment = _letters(list_index[i], list_items[i]->capitalize);
+			segments++;
 		} else if (list_items[i]->list_type == LIST_ROMAN) {
 			segment = _roman(list_index[i], list_items[i]->capitalize);
+			segments++;
 		}
 		if (rtl) {
 			prefix = prefix + segment;