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

Merge pull request #1899 from guilhermefelipecgs/fix_#1897

Browse source 
Fix for scroll_to_line and search functions, fix #1897
This commit is contained in:
Juan Linietsky 2015-10-17 12:14:07 -03:00
commit be0f7563fb
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scene/gui/rich_text_label.cpp
View file

@ -1503,10 +1503,10 @@ Error RichTextLabel::append_bbcode(const String& p_bbcode) {
void RichTextLabel::scroll_to_line(int p_line) {
p_line -= 1;
ERR_FAIL_INDEX(p_line,lines.size());
_validate_line_caches();
vscroll->set_val(lines[p_line].height_accum_cache);
vscroll->set_val(lines[p_line].height_accum_cache-lines[p_line].height_cache);
}
@ -1569,27 +1569,23 @@ bool RichTextLabel::search(const String& p_string,bool p_from_selection) {
it=_get_next_item(it);
}
if (!it)
line=lines.size()-1;
}
scroll_to_line(line-2);
if (line > 1) {
line-=1;
}
scroll_to_line(line);
return true;
}
} else if (it->type==ITEM_NEWLINE) {
line=static_cast<ItemNewline*>(it)->line;
}
it=_get_next_item(it);
charidx=0;
}
return false;
}