diff options
| author | Richard Linden <none@none> | 2011-09-27 19:06:02 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-09-27 19:06:02 -0700 |
| commit | 68d5141fb3ccb5e898caa83e9eab84d76134e28c (patch) | |
| tree | 02ecd4cf801e30e895520b49674ed455b94dfe89 /indra/llui/llbutton.cpp | |
| parent | bce16356c9e1fb76bd92a3530375e4c6c7a5430a (diff) | |
EXP-1258 WIP toggle buttons between icons and icons+text modes
fixed button layout for icon+text
layout stack now uses floating point precision to avoid clamping panels to 0
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 02ac928dfb..e1bea086b2 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), |