livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-8259 FIXED Fixed occasional truncation of the "More" link in expandable textboxes. 

The bug seems to happen when the text contains trailing newlines.
So the workaround is to strip those newlines.
I use a workaround because a proper fix might require changing LLTextBase which is undesirable at this point.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/722/

--HG--
branch : product-engine
master
Vadim Savchuk 2010-07-09 20:10:26 +03:00
parent 96631f6d4e
commit 331ccee1f5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llexpandabletextbox.cpp
View File

@ -140,7 +140,13 @@ void LLExpandableTextBox::LLTextBoxEx::setText(const LLStringExplicit& text,cons
// LLTextBox::setText will obliterate the expander segment, so make sure
// we generate it again by clearing mExpanderVisible
mExpanderVisible = false;
LLTextEditor::setText(text, input_params);
// Workaround for EXT-8259: trim text before rendering it.
{
std::string trimmed_text(text);
LLStringUtil::trim(trimmed_text);
LLTextEditor::setText(trimmed_text, input_params);
}
// text contents have changed, segments are cleared out
// so hide the expander and determine if we need it