diff options
| author | James Cook <james@lindenlab.com> | 2009-12-03 15:30:49 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-03 15:30:49 -0800 |
| commit | 275b4f58496c4a6a8eb81e94701db858d5ecb99a (patch) | |
| tree | e3aa8c38d52cc3b05fe8be4d6d210a6be3d36a5b /indra/llui/lltextbase.cpp | |
| parent | 9388a1a9386d4f333323bf2e49bd04766598b2e8 (diff) | |
| parent | 2add7f70458a4a439d2fb25039c24d6bbbf245e9 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 741ab1737d..82a3c5cf47 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -543,9 +543,17 @@ void LLTextBase::drawText() line_end = next_start; } + // A patch for EXT-1944 "Implement ellipses in message well" + // introduced a regression where text in SansSerif ending in the + // letter "r" is clipped. This may be due to an off-by-one in + // font width information out of FreeType with our fractional font + // sizes. For now, just make an extra pixel of space to resolve + // EXT-2971 "Letter R doesn't show when it's the last letter in a + // text block". See James/Richard for details. + const S32 FIX_CLIPPING_HACK = 1; LLRect text_rect(line.mRect.mLeft + mTextRect.mLeft - scrolled_view_rect.mLeft, line.mRect.mTop - scrolled_view_rect.mBottom + mTextRect.mBottom, - llmin(mDocumentView->getRect().getWidth(), line.mRect.mRight) - scrolled_view_rect.mLeft, + llmin(mDocumentView->getRect().getWidth(), line.mRect.mRight) - scrolled_view_rect.mLeft + FIX_CLIPPING_HACK, line.mRect.mBottom - scrolled_view_rect.mBottom + mTextRect.mBottom); // draw a single line of text |