From 4f0a34ae7e79af29e50035e1536ae6b1d1928daf Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 3 Mar 2010 12:44:07 +0200
Subject: [PATCH] Update for normal bug EXT-5856 - "Auto renew each week"
checkbox is displayed in the Classified Info from other resident profile.
Added layout stack to auto reposition description when auto_renew is being
shown or hidden.
--HG--
branch : product-engine
---
indra/newview/llpanelclassified.cpp | 2 +-
.../default/xui/en/panel_classified_info.xml | 43 ++++++++++++++++---
2 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index 68691a14081..7cf27d91415 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -1294,7 +1294,7 @@ void LLPanelClassifiedInfo::resetControls()
childSetEnabled("edit_btn", is_self);
childSetVisible("edit_btn", is_self);
- childSetVisible("auto_renew", is_self);
+ childSetVisible("price_layout_panel", is_self);
}
void LLPanelClassifiedInfo::setClassifiedName(const std::string& name)
diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml
index cc26c3093ca..221cc9de63d 100644
--- a/indra/newview/skins/default/xui/en/panel_classified_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml
@@ -185,26 +185,57 @@
v_pad="0"
value="[price]"
width="105" />
+ <layout_stack
+ animate="false"
+ name="descr_stack"
+ layout="topleft"
+ follows="top|left"
+ orientation="vertical"
+ left="10"
+ top_pad="5"
+ width="290"
+ height="250">
+ <layout_panel
+ auto_resize="false"
+ name="price_layout_panel"
+ layout="topleft"
+ follows="top|left"
+ left="0"
+ top="0"
+ width="290"
+ height="26"
+ user_resize="false">
<check_box
enabled="false"
height="16"
label="Auto renew each week"
layout="topleft"
- left="10"
+ follows="top|left"
+ left="0"
name="auto_renew"
- top_pad="5"
+ top="0"
v_pad="0"
width="290" />
+ </layout_panel>
+ <layout_panel
+ name="descr_layout_panel"
+ layout="topleft"
+ follows="top|left"
+ left="0"
+ top="0"
+ width="290"
+ height="215"
+ user_resize="false">
<text
auto_resize="false"
follows="left|top"
font.style="BOLD"
height="10"
layout="topleft"
- left="10"
+ left="0"
name="classified_desc_label"
text_color="white"
- top_pad="10"
+ top="0"
value="Description:"
width="250" />
<text_editor
@@ -215,7 +246,7 @@
h_pad="0"
height="200"
layout="topleft"
- left="10"
+ left="0"
max_length="1023"
name="classified_desc"
read_only="true"
@@ -224,6 +255,8 @@
v_pad="0"
value="[description]"
word_wrap="true" />
+ </layout_panel>
+ </layout_stack>
</panel>
</scroll_container>
<panel
--
GitLab