From 760e672e80de881c0a501dd0b44cfac1342b11c2 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 1 Apr 2011 00:10:05 -0700
Subject: SOCIAL-822 FIX UI and Sizing issues with hints in Basic and Advanced
modes
---
indra/newview/llhints.cpp | 8 +++++---
indra/newview/skins/default/xui/en/panel_hint.xml | 4 ++--
indra/newview/skins/default/xui/en/panel_hint_image.xml | 8 ++++----
3 files changed, 11 insertions(+), 9 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);
diff --git a/indra/newview/skins/default/xui/en/panel_hint.xml b/indra/newview/skins/default/xui/en/panel_hint.xml
index c883fd8a1d..f7434f0330 100644
--- a/indra/newview/skins/default/xui/en/panel_hint.xml
+++ b/indra/newview/skins/default/xui/en/panel_hint.xml
@@ -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"/>
diff --git a/indra/newview/skins/default/xui/en/panel_hint_image.xml b/indra/newview/skins/default/xui/en/panel_hint_image.xml
index 30dd1836f1..df05d50dc5 100644
--- a/indra/newview/skins/default/xui/en/panel_hint_image.xml
+++ b/indra/newview/skins/default/xui/en/panel_hint_image.xml
@@ -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"/>
--
cgit v1.2.3