diff options
| author | Richard Linden <none@none> | 2012-01-27 19:55:42 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-27 19:55:42 -0800 |
| commit | 3249a1ced0a4d0bc45d04f5794c989e12e62033b (patch) | |
| tree | c2ea68941e0f8a8c34aa623f8db75f2a634699b5 /indra/llui | |
| parent | 84b7ff7915207dffad8da7aba959ab36bfa49c0f (diff) | |
| parent | 22a6170a7b19b3a6f44536b7552b633416348775 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llbutton.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/lltextbase.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index f0d92d597a..705fe16559 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -908,9 +908,9 @@ void LLButton::draw() // Not sure if it is really needed. Probably S32_MAX should be always passed as max_chars. mLastDrawCharsCount = mGLFont->render(label, 0, (F32)x, - (F32)(mBottomVPad + y_offset), + (F32)(getRect().getHeight() / 2 + mBottomVPad), label_color % alpha, - mHAlign, LLFontGL::BOTTOM, + mHAlign, LLFontGL::VCENTER, LLFontGL::NORMAL, mDropShadowedText ? LLFontGL::DROP_SHADOW_SOFT : LLFontGL::NO_SHADOW, S32_MAX, text_width, diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 0040be45c7..e3c9c3c561 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2395,8 +2395,8 @@ void LLTextBase::updateRects() } mTextBoundingRect.mTop += mVPad; - // subtract a pixel off the bottom to deal with rounding errors in measuring font height - mTextBoundingRect.mBottom -= 1; + //// subtract a pixel off the bottom to deal with rounding errors in measuring font height + //mTextBoundingRect.mBottom -= 1; S32 delta_pos = -mTextBoundingRect.mBottom; // move line segments to fit new document rect |