diff options
| author | Richard Linden <none@none> | 2011-04-01 00:10:53 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-04-01 00:10:53 -0700 |
| commit | 84f242ff4fc7743e909f53695a4e7a51c3c60299 (patch) | |
| tree | 1e460865b69b38b7567a6d54842cdffeebace040 /indra/newview/llhints.cpp | |
| parent | 3fc293b73b1c504920595a4de71da89f799c4513 (diff) | |
| parent | 760e672e80de881c0a501dd0b44cfac1342b11c2 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2
Diffstat (limited to 'indra/newview/llhints.cpp')
| -rw-r--r-- | indra/newview/llhints.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llhints.cpp b/indra/newview/llhints.cpp index 97f0e36a0c..722d67caf9 100644 --- a/indra/newview/llhints.cpp +++ b/indra/newview/llhints.cpp @@ -192,7 +192,7 @@ BOOL LLHintPopup::postBuild() 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); +// hint_text.translate(0, -delta_height); return TRUE; } @@ -219,8 +219,10 @@ void LLHintPopup::draw() 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); + S32 delta_height = image_height - hint_icon.getParent()->getParent()->getRect().getHeight(); + hint_icon.getParent()->reshape(image_width, hint_icon.getParent()->getRect().getHeight()); + hint_icon.getParent()->getParent()->reshape(hint_icon.getParent()->getParent()->getRect().getWidth(), image_height); + hint_icon.getParent()->getParent()->translate(0, -delta_height); LLRect hint_rect = getLocalRect(); reshape(hint_rect.getWidth(), hint_rect.getHeight() + delta_height); |