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

Merge from default branch 

--HG--
branch : product-engine
meow-7.2.2
Mike Antipov 2010-07-30 13:33:19 +03:00
parent c13048fd8a 2c86deb92a
commit e263923d79
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llrender/llfontgl.cpp
View File

@ -369,7 +369,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
if (right_x)
{
*right_x = cur_x / sScaleX;
*right_x = (cur_x - origin.mV[VX]) / sScaleX;
}
//FIXME: add underline as glyph?

6
indra/llui/lltextbase.cpp
View File

@ -1029,8 +1029,10 @@ void LLTextBase::draw()
LLUICtrl::draw();
{
// only clip if we support scrolling or have word wrap turned off
LLLocalClipRect clip(doc_rect, !getWordWrap() || mScroller != NULL);
// only clip if we support scrolling...
// since convention is that text boxes never vertically truncate their contents
// regardless of rect bounds
LLLocalClipRect clip(doc_rect, mScroller != NULL);
drawSelectionBackground();
drawText();
drawCursor();

8
indra/newview/llexpandabletextbox.cpp
View File

@ -141,13 +141,7 @@ 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;
// Workaround for EXT-8259: trim text before rendering it.
{
std::string trimmed_text(text);
LLStringUtil::trim(trimmed_text);
LLTextEditor::setText(trimmed_text, input_params);
}
LLTextEditor::setText(text, input_params);
// text contents have changed, segments are cleared out
// so hide the expander and determine if we need it