summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeequlim <geequlim@gmail.com>2017-05-27 14:07:18 +0800
committerRĂ©mi Verschelde <rverschelde@gmail.com>2017-05-27 11:37:33 +0200
commitb93fce1c18a58e752c07a634ed11aa8ec199601d (patch)
treed490e050abb73cf9cad667abb1093f9a9d25fde5
parentcba62864c828f9737cc38e34303cefe20ad423a4 (diff)
Fix text warp in color blocks with CJK
(cherry picked from commit cd778e00dc5362d00d4760c79fc301951f6f9b75)
-rw-r--r--scene/gui/rich_text_label.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index a142bf5981..a618810c11 100644
--- a/scene/gui/rich_text_label.cpp
+++ b/scene/gui/rich_text_label.cpp
@@ -264,7 +264,7 @@ void RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int
cw = tab_size * font->get_char_size(' ').width;
}
- if (end > 0 && w + cw + begin > p_width) {
+ if (end > 0 && w + cw + wofs > p_width) {
break; //don't allow lines longer than assigned width
}