From c204170232a6e15d60ad67e684b21453abd71184 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 14 Jun 2016 08:09:27 -0300 Subject: [PATCH] correctly wrap lines longer than width in richtextlabel, fixes #4735 --- scene/gui/rich_text_label.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 80949b4eb4b..786ce27a0cd 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -278,6 +278,11 @@ if (m_height > line_height) {\ if (c[end]=='\t') { cw=tab_size*font->get_char_size(' ').width; } + + if (end>0 && w+cw+begin > p_width ) { + break; //don't allow lines longer than assigned width + } + w+=cw; if (c[end]==' ') { @@ -340,10 +345,12 @@ if (m_height > line_height) {\ int cw=font->get_char_size(c[i],c[i+1]).x; + if (c[i]=='\t') { cw=tab_size*font->get_char_size(' ').width; } + if (p_click_pos.x-cw/2>p_ofs.x+align_ofs+pofs) { rchar=int((&c[i])-cf);