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

[RTL] Use list iterators for item/paragraph removal. 

(cherry picked from commit 88177a5a58)
This commit is contained in:
bruvzg 2023-08-21 18:50:50 +03:00 committed by Yuri Sizov
parent 265fe750a8
commit 140eb6886f
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scene/gui/rich_text_label.cpp
View File

@ -3061,15 +3061,17 @@ void RichTextLabel::_remove_item(Item *p_item, const int p_line, const int p_sub
// If a newline was erased, all lines AFTER the newline need to be decremented. // If a newline was erased, all lines AFTER the newline need to be decremented.
if (p_item->type == ITEM_NEWLINE) { if (p_item->type == ITEM_NEWLINE) {
current_frame->lines.remove_at(p_line); current_frame->lines.remove_at(p_line);
for (int i = 0; i < current->subitems.size(); i++) { if (p_line < (int)current_frame->lines.size() && current_frame->lines[p_line].from) {
if (current->subitems[i]->line > p_subitem_line) { for (List<Item *>::Element *E = current_frame->lines[p_line].from->E; E; E = E->next()) {
current->subitems[i]->line--; if (E->get()->line > p_subitem_line) {
E->get()->line--;
}
} }
} }
} }
} else { } else {
// First, remove all child items for the provided item. // First, remove all child items for the provided item.
for (int i = 0; i < size; i++) { while (p_item->subitems.size()) {
_remove_item(p_item->subitems.front()->get(), p_line, p_subitem_line); _remove_item(p_item->subitems.front()->get(), p_line, p_subitem_line);
} }
// Then remove the provided item itself. // Then remove the provided item itself.
@ -3165,19 +3167,23 @@ bool RichTextLabel::remove_paragraph(const int p_paragraph) {
} }
// Remove all subitems with the same line as that provided. // Remove all subitems with the same line as that provided.
Vector<int> subitem_indices_to_remove; Vector<List<Item *>::Element *> subitem_to_remove;
for (int i = 0; i < current->subitems.size(); i++) { if (current_frame->lines[p_paragraph].from) {
if (current->subitems[i]->line == p_paragraph) { for (List<Item *>::Element *E = current_frame->lines[p_paragraph].from->E; E; E = E->next()) {
subitem_indices_to_remove.push_back(i); if (E->get()->line == p_paragraph) {
subitem_to_remove.push_back(E);
} else {
break;
}
} }
} }
bool had_newline = false; bool had_newline = false;
// Reverse for loop to remove items from the end first. // Reverse for loop to remove items from the end first.
for (int i = subitem_indices_to_remove.size() - 1; i >= 0; i--) { for (int i = subitem_to_remove.size() - 1; i >= 0; i--) {
int subitem_idx = subitem_indices_to_remove[i]; List<Item *>::Element *subitem = subitem_to_remove[i];
had_newline = had_newline || current->subitems[subitem_idx]->type == ITEM_NEWLINE; had_newline = had_newline || subitem->get()->type == ITEM_NEWLINE;
_remove_item(current->subitems[subitem_idx], current->subitems[subitem_idx]->line, p_paragraph); _remove_item(subitem->get(), subitem->get()->line, p_paragraph);
} }
if (!had_newline) { if (!had_newline) {