From 897d6377b7fac17a45c8cb1f572bff7349697e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 7 Jun 2017 07:38:53 +0200 Subject: Revert "Fix text warp in color blocks with CJK" This reverts commit cd778e00dc5362d00d4760c79fc301951f6f9b75. That commit introduced regressions for non-CJK languages are discussed in #8952. Fixes #9078. --- scene/gui/rich_text_label.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index d3a49b06d5..0b8595de42 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 + wofs > p_width) { + if (end > 0 && w + cw + begin > p_width) { break; //don't allow lines longer than assigned width } -- cgit v1.2.3