godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92745 from bruvzg/rtl_list_fix 

[RTL] Fix nested ordered lists inside unordered lists.
This commit is contained in:
Rémi Verschelde 2024-06-04 10:10:34 +02:00
parent 0242e3ca9f 5e616cedd4
commit 7c2d65ff66
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scene/gui/rich_text_label.cpp
View File

@ -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); _find_list(l.from, list_index, list_items);
String prefix; String prefix;
int segments = 0;
for (int i = 0; i < list_index.size(); i++) { 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) { if (rtl) {
prefix = prefix + "."; prefix = prefix + ".";
} else { } else {
prefix = "." + prefix; prefix = "." + prefix;
} }
String segment; if (list_items[i]->list_type == LIST_NUMBERS) {
if (list_items[i]->list_type == LIST_DOTS) {
prefix = list_items[i]->bullet;
break;
} else if (list_items[i]->list_type == LIST_NUMBERS) {
segment = itos(list_index[i]); segment = itos(list_index[i]);
if (is_localizing_numeral_system()) { if (is_localizing_numeral_system()) {
segment = TS->format_number(segment, _find_language(l.from)); segment = TS->format_number(segment, _find_language(l.from));
} }
segments++;
} else if (list_items[i]->list_type == LIST_LETTERS) { } else if (list_items[i]->list_type == LIST_LETTERS) {
segment = _letters(list_index[i], list_items[i]->capitalize); segment = _letters(list_index[i], list_items[i]->capitalize);
segments++;
} else if (list_items[i]->list_type == LIST_ROMAN) { } else if (list_items[i]->list_type == LIST_ROMAN) {
segment = _roman(list_index[i], list_items[i]->capitalize); segment = _roman(list_index[i], list_items[i]->capitalize);
segments++;
} }
if (rtl) { if (rtl) {
prefix = prefix + segment; prefix = prefix + segment;