asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21877 from DualMatrix/richlabel

Browse source 
Fixed the remove_line function in richtextlabel. It was totally broken
This commit is contained in:
Rémi Verschelde 2018-09-12 14:59:34 +02:00 committed by GitHub
commit 82a0e752df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scene/gui/rich_text_label.cpp
View file

@ -1423,18 +1423,28 @@ bool RichTextLabel::remove_line(const int p_line) {
if (p_line >= current_frame->lines.size() || p_line < 0) if (p_line >= current_frame->lines.size() || p_line < 0)
return false; return false;
int lines = p_line * 2; int i = 0;
while (i < current->subitems.size() && current->subitems[i]->line < p_line) {
if (current->subitems[lines]->type != ITEM_NEWLINE) i++;
_remove_item(current->subitems[lines], current->subitems[lines]->line, lines);
_remove_item(current->subitems[lines], current->subitems[lines]->line, lines);
if (p_line == 0) {
main->lines.write[0].from = main;
} }
bool was_newline = false;
while (i < current->subitems.size()) {
was_newline = current->subitems[i]->type == ITEM_NEWLINE;
_remove_item(current->subitems[i], current->subitems[i]->line, p_line);
if (was_newline)
break;
}
if (!was_newline) {
current_frame->lines.remove(p_line);
}
if (p_line == 0 && current->subitems.size() > 0)
main->lines.write[0].from = main;
main->first_invalid_line = 0; main->first_invalid_line = 0;
return true; return true;
} }