diff options
| author | Richard Linden <none@none> | 2012-01-18 16:30:53 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-18 16:30:53 -0800 |
| commit | 3a597af700e55e2017c85220b2b97cc9f3aef9aa (patch) | |
| tree | 27fad847f98fbe41732584ec84fd7458a4e0f02f /indra/newview/llhudtext.cpp | |
| parent | e41ad89f7b68b5f9edaf1fd66decadb8e08d1dce (diff) | |
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
fixed font metrics rounding error and made corrective adjustments in layout
Diffstat (limited to 'indra/newview/llhudtext.cpp')
| -rw-r--r-- | indra/newview/llhudtext.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp index 24a876c59a..f116c8ee6e 100644 --- a/indra/newview/llhudtext.cpp +++ b/indra/newview/llhudtext.cpp @@ -227,7 +227,7 @@ void LLHUDText::renderText() segment_iter != mTextSegments.end(); ++segment_iter ) { const LLFontGL* fontp = segment_iter->mFont; - y_offset -= fontp->getLineHeight(); + y_offset -= fontp->getLineHeight() - 1; U8 style = segment_iter->mStyle; LLFontGL::ShadowType shadow = LLFontGL::DROP_SHADOW; @@ -480,8 +480,6 @@ void LLHUDText::updateSize() F32 width = 0.f; S32 max_lines = getMaxLines(); - //S32 lines = (max_lines < 0) ? (S32)mTextSegments.size() : llmin((S32)mTextSegments.size(), max_lines); - //F32 height = (F32)mFontp->getLineHeight() * (lines + mLabelSegments.size()); S32 start_segment; if (max_lines < 0) start_segment = 0; @@ -491,7 +489,7 @@ void LLHUDText::updateSize() while (iter != mTextSegments.end()) { const LLFontGL* fontp = iter->mFont; - height += fontp->getLineHeight(); + height += fontp->getLineHeight() - 1; width = llmax(width, llmin(iter->getWidth(fontp), HUD_TEXT_MAX_WIDTH)); ++iter; } |