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

RichTextLabel: Fix adding raw text when bbcode is disabled

Browse Source 
Fixes #5605.
This commit is contained in:
Rémi Verschelde 2016-07-09 14:26:49 +02:00
parent ca009ac4af
commit 3816fe9d19
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scene/gui/rich_text_label.cpp
View File

@ -662,8 +662,7 @@ void RichTextLabel::_notification(int p_what) {
} break; } break;
case NOTIFICATION_ENTER_TREE: { case NOTIFICATION_ENTER_TREE: {
if (use_bbcode) set_bbcode(bbcode);
parse_bbcode(bbcode);
main->first_invalid_line=0; //invalidate ALL main->first_invalid_line=0; //invalidate ALL
update(); update();
@ -1440,7 +1439,6 @@ bool RichTextLabel::is_scroll_following() const {
Error RichTextLabel::parse_bbcode(const String& p_bbcode) { Error RichTextLabel::parse_bbcode(const String& p_bbcode) {
clear(); clear();
return append_bbcode(p_bbcode); return append_bbcode(p_bbcode);
} }
@ -1858,6 +1856,10 @@ void RichTextLabel::set_bbcode(const String& p_bbcode) {
bbcode=p_bbcode; bbcode=p_bbcode;
if (is_inside_tree() && use_bbcode) if (is_inside_tree() && use_bbcode)
parse_bbcode(p_bbcode); parse_bbcode(p_bbcode);
else { // raw text
clear();
add_text(p_bbcode);
}
} }
String RichTextLabel::get_bbcode() const { String RichTextLabel::get_bbcode() const {
@ -1869,8 +1871,7 @@ void RichTextLabel::set_use_bbcode(bool p_enable) {
if (use_bbcode==p_enable) if (use_bbcode==p_enable)
return; return;
use_bbcode=p_enable; use_bbcode=p_enable;
if (is_inside_tree() && use_bbcode) set_bbcode(bbcode);
parse_bbcode(bbcode);
} }
bool RichTextLabel::is_using_bbcode() const { bool RichTextLabel::is_using_bbcode() const {