diff options
| author | Rémi Verschelde | 2017-05-27 11:34:31 +0200 |
|---|---|---|
| committer | GitHub | 2017-05-27 11:34:31 +0200 |
| commit | 6fb97d9898e104213e14b83a9ad8beb1d002a9c4 (patch) | |
| tree | d380c647381d7cc82db81b4a9603ac407f835736 | |
| parent | 3ebf4d5b327d8b1ba5351b6a6f2668b9cdef15fb (diff) | |
| parent | cd778e00dc5362d00d4760c79fc301951f6f9b75 (diff) | |
| download | godot-6fb97d9898e104213e14b83a9ad8beb1d002a9c4.tar.gz godot-6fb97d9898e104213e14b83a9ad8beb1d002a9c4.tar.zst godot-6fb97d9898e104213e14b83a9ad8beb1d002a9c4.zip | |
Merge pull request #8952 from GodotExplorer/pr-fix-richtextlabel-warp-CJK
[2.1] Fix text warp in color blocks with CJK
| -rw-r--r-- | scene/gui/rich_text_label.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 85ab3ffda..8b551ab0b 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 } |