summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2015-12-02 16:16:18 +0100
committerRémi Verschelde <remi@verschelde.fr>2015-12-02 16:16:18 +0100
commit68d3438a9351498909ffa0bfe79f51b74004e906 (patch)
treea1d267cd4d32b8f937498f83e11e19b9fa80b5a1
parent064fd762fae75371658e773a3acf39616e813b08 (diff)
parent11b560d6d436a64a54daa5a5c8eb0a460dff7840 (diff)
Merge pull request #2975 from neikeq/help_scroll_top
Fix help view not scrolling to the top
-rw-r--r--scene/gui/rich_text_label.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 552d8789a6..5abb6c1d01 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -1504,7 +1504,6 @@ 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-lines[p_line].height_cache);
@@ -1572,11 +1571,8 @@ bool RichTextLabel::search(const String& p_string,bool p_from_selection) {
}
- if (line > 1) {
- line-=1;
- }
-
- scroll_to_line(line);
+ line-=2;
+ scroll_to_line(line<0?0:line);
return true;
}