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

merge

master
Richard Linden 2010-07-29 12:05:48 -07:00
parent 27e07e819d e69f0f8a02
commit 5b609171ff
2 changed files with 5 additions and 3 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();