diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
| commit | 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch) | |
| tree | 3c34a3a180b5275bd4166b0056765c5868f56447 /indra/llui/llbutton.cpp | |
| parent | f6a10b3214d79df4e8f5768acaa68edbd2de5620 (diff) | |
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index d93748d069..bdf1c12b79 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -197,6 +197,9 @@ void LLButton::init(void (*click_callback)(void*), void *callback_data, const LL mHighlightColor = ( LLUI::sColorsGroup->getColor( "ButtonUnselectedFgColor" ) ); mUnselectedBgColor = ( LLUI::sColorsGroup->getColor( "ButtonUnselectedBgColor" ) ); mSelectedBgColor = ( LLUI::sColorsGroup->getColor( "ButtonSelectedBgColor" ) ); + + mImageOverlayAlignment = LLFontGL::HCENTER; + mImageOverlayColor = LLColor4::white; } LLButton::~LLButton() @@ -607,7 +610,7 @@ void LLButton::draw() // draw overlay image if (mImageOverlay.notNull()) { - const S32 IMG_PAD = 4; + const S32 IMG_PAD = 5; // get max width and height (discard level 0) S32 overlay_width = mImageOverlay->getWidth(0); S32 overlay_height = mImageOverlay->getHeight(0); @@ -628,7 +631,7 @@ void LLButton::draw() overlay_width, overlay_height, mImageOverlay, - LLColor4::white); + mImageOverlayColor); break; case LLFontGL::HCENTER: gl_draw_scaled_image( @@ -637,7 +640,7 @@ void LLButton::draw() overlay_width, overlay_height, mImageOverlay, - LLColor4::white); + mImageOverlayColor); break; case LLFontGL::RIGHT: gl_draw_scaled_image( @@ -646,7 +649,7 @@ void LLButton::draw() overlay_width, overlay_height, mImageOverlay, - LLColor4::white); + mImageOverlayColor); break; default: // draw nothing @@ -866,7 +869,7 @@ void LLButton::setHoverImages( const LLString& image_name, const LLString& selec setImageHoverSelected(selected_name); } -void LLButton::setImageOverlay(const LLString &image_name, LLFontGL::HAlign alignment) +void LLButton::setImageOverlay(const LLString &image_name, LLFontGL::HAlign alignment, const LLColor4& color) { if (image_name.empty()) { @@ -877,6 +880,7 @@ void LLButton::setImageOverlay(const LLString &image_name, LLFontGL::HAlign alig LLUUID overlay_image_id = LLUI::findAssetUUIDByName(image_name); mImageOverlay = LLUI::sImageProvider->getUIImageByID(overlay_image_id); mImageOverlayAlignment = alignment; + mImageOverlayColor = color; } } |