livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2

meow-7.2.2
Richard Linden 2011-04-01 00:10:53 -07:00
parent 3fc293b73b 760e672e80
commit 84f242ff4f
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llhints.cpp
View File

@ -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);

4
indra/newview/skins/default/xui/en/panel_hint.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
width="205"
height="100">
height="34">
<text name="hint_title"
font="SansSerifMedium"
left="8"
@ -15,7 +15,7 @@
left="8"
right="197"
top="26"
bottom="92"
bottom="26"
follows="left|right|bottom"
text_color="Black"
wrap="true"/>

8
indra/newview/skins/default/xui/en/panel_hint_image.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
width="305"
height="140"
height="40"
layout="topleft">
<text name="hint_title"
font="SansSerifMedium"
@ -16,7 +16,7 @@
top="25"
width="305"
height="0"
follows="all"
follows="left|top|right"
orientation="horizontal">
<layout_panel auto_resize="true" width="100"/>
<layout_panel auto_resize="true" width="0">
@ -32,8 +32,8 @@
<text name="hint_text"
left="8"
right="297"
top_pad="5"
bottom="120"
top="30"
bottom="30"
follows="left|right|bottom"
text_color="Black"
wrap="true"/>