summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2017-09-20 15:01:36 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2017-09-20 15:01:36 +0300
commit818a0f7f774655d9fa58d3e1a452439e334aaf56 (patch)
treea79ba34733c50c45f56dd4d111a0e3c7a4b36770 /indra/llui
parenta27466ca07e5568442053e02ac9e76297ee74787 (diff)
MAINT-7790 Fixed vertical image alignment for buttons
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llbutton.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 8c7df45884..510a2537b9 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -808,11 +808,12 @@ void LLButton::draw()
}
else
{
- imagep->draw(0, 0, (enabled ? mImageColor.get() : disabled_color) % alpha );
+ S32 y = getLocalRect().getHeight() - imagep->getHeight();
+ imagep->draw(0, y, (enabled ? mImageColor.get() : disabled_color) % alpha);
if (mCurGlowStrength > 0.01f)
{
gGL.setSceneBlendType(glow_type);
- imagep->drawSolid(0, 0, glow_color % (mCurGlowStrength * alpha));
+ imagep->drawSolid(0, y, glow_color % (mCurGlowStrength * alpha));
gGL.setSceneBlendType(LLRender::BT_ALPHA);
}
}
@@ -954,7 +955,8 @@ void LLButton::drawBorder(LLUIImage* imagep, const LLColor4& color, S32 size)
}
else
{
- imagep->drawBorder(0, 0, color, size);
+ S32 y = getLocalRect().getHeight() - imagep->getHeight();
+ imagep->drawBorder(0, y, color, size);
}
}