summaryrefslogtreecommitdiff
path: root/indra/newview/llhints.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-28 17:38:54 -0700
committerRichard Linden <none@none>2011-03-28 17:38:54 -0700
commit84b179b0bf254ae039dfdba330d25ac2df1c0a67 (patch)
tree8e35dad1a88b3538722ee3d68891fa6ef9fdf779 /indra/newview/llhints.cpp
parent5b316df2249fc62c1e6a4f089b9726c4e62f23e0 (diff)
parentd597efc0f365fa07de9b7c0641dc4297466bfae5 (diff)
Automated merge with file:///F:\code\viewer-autobuild2010
Diffstat (limited to 'indra/newview/llhints.cpp')
-rw-r--r--indra/newview/llhints.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp
index c4dcaf11f9..97f0e36a0c 100644
--- a/indra/newview/llhints.cpp
+++ b/indra/newview/llhints.cpp
@@ -191,6 +191,8 @@ BOOL LLHintPopup::postBuild()
LLRect text_bounds = hint_text.getTextBoundingRect();
S32 delta_height = text_bounds.getHeight() - hint_text.getRect().getHeight();
reshape(getRect().getWidth(), getRect().getHeight() + delta_height);
+ hint_text.reshape(hint_text.getRect().getWidth(), hint_text.getRect().getHeight() + delta_height);
+ hint_text.translate(0, -delta_height);
return TRUE;
}
@@ -211,6 +213,18 @@ void LLHintPopup::draw()
alpha = clamp_rescale(mFadeTimer.getElapsedTimeF32(), 0.f, mFadeInTime, 0.f, 1.f);
}
+ LLIconCtrl& hint_icon = getChildRef<LLIconCtrl>("hint_image");
+
+ LLUIImagePtr hint_image = hint_icon.getImage();
+ S32 image_height = hint_image.isNull() ? 0 : hint_image->getHeight();
+ S32 image_width = hint_image.isNull() ? 0 : hint_image->getWidth();
+
+ S32 delta_height = image_height - hint_icon.getRect().getHeight();
+ hint_icon.getParent()->reshape(image_width, image_height);
+
+ LLRect hint_rect = getLocalRect();
+ reshape(hint_rect.getWidth(), hint_rect.getHeight() + delta_height);
+
{ LLViewDrawContext context(alpha);
if (mTarget.empty())