diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-09-27 20:00:27 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-09-27 20:00:27 -0700 |
| commit | d11cc7bf46bc12afa3394544840ee26a4d0d9b18 (patch) | |
| tree | 080e1bbef8d228c8541c901a1f5866d4a8c06e68 /indra/llui/llbutton.cpp | |
| parent | 1bdfe7ec471efb94acc4a8f98e8084c08199c9da (diff) | |
| parent | 78eb989e50e7f91298294d34a743f8ac0e3dcce1 (diff) | |
EXP-1202 : pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 02ac928dfb..f259e8027e 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -819,6 +819,7 @@ void LLButton::draw() { case LLFontGL::LEFT: text_left += overlay_width + mImgOverlayLabelSpace; + text_width -= overlay_width + mImgOverlayLabelSpace; mImageOverlay->draw( mLeftHPad, center_y - (overlay_height / 2), @@ -836,6 +837,7 @@ void LLButton::draw() break; case LLFontGL::RIGHT: text_right -= overlay_width + mImgOverlayLabelSpace; + text_width -= overlay_width + mImgOverlayLabelSpace; mImageOverlay->draw( getRect().getWidth() - mRightHPad - overlay_width, center_y - (overlay_height / 2), @@ -1013,6 +1015,7 @@ void LLButton::resize(LLUIString label) min_width += overlay_width + mImgOverlayLabelSpace; break; case LLFontGL::HCENTER: + min_width = llmax(min_width, overlay_width + mLeftHPad + mRightHPad); break; default: // draw nothing |