summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorSergei Litovchuk <slitovchuk@productengine.com>2010-01-14 18:52:52 +0200
committerSergei Litovchuk <slitovchuk@productengine.com>2010-01-14 18:52:52 +0200
commit6649dcc38ea13ecc6390891e9ac6ae606070ce60 (patch)
tree9af6cd8f94019d7965fbf35d13d875974126736b /indra/newview/skins/default/xui
parent24d8bf26fc489c7cb35cd4d8bfba2ca8c1e46442 (diff)
Fixed normal bug (EXT-3794) Controls in Edit Pick side panel cut off by
vertical scrollbar. - Added resizing pick info and pick editing panels when vertical scrollbar appears. - Resized controls on pick info and edit panels to avoid them being overlapped by scrollbar. - Changed pick info description from text box to text editor in read-only mode to allow text scrolling. - Removed text box resizing logic from LLPanelPickEdit. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_pick.xml32
-rw-r--r--indra/newview/skins/default/xui/en/panel_pick_info.xml33
2 files changed, 34 insertions, 31 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index d6de5af32d..7769189219 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -38,28 +38,27 @@
<scroll_container
color="DkGray2"
follows="all"
- height="510"
+ height="500"
layout="topleft"
left="10"
top_pad="10"
name="profile_scroll"
- reserve_scroll_corner="false"
opaque="true"
width="313">
<panel
name="scroll_content_panel"
- follows="left|top"
+ follows="left|top|right"
min_height="300"
layout="topleft"
top="0"
background_visible="false"
- height="510"
+ height="500"
left="0"
- width="295">
+ width="285">
<texture_picker
follows="left|top|right"
height="197"
- width="290"
+ width="280"
layout="topleft"
top="20"
left="10"
@@ -77,7 +76,7 @@
<text
type="string"
length="1"
- follows="left|top"
+ follows="left|top|right"
height="15"
font="SansSerifSmall"
font.style="BOLD"
@@ -86,7 +85,7 @@
top="215"
name="Name:"
text_color="white"
- width="290">
+ width="280">
Title:
</text>
<line_editor
@@ -99,11 +98,11 @@
max_length="63"
name="pick_name"
text_color="black"
- width="290" />
+ width="280" />
<text
type="string"
length="1"
- follows="left|top"
+ follows="left|top|right"
height="15"
font="SansSerifSmall"
font.style="BOLD"
@@ -112,13 +111,13 @@
top_pad="20"
name="description_label"
text_color="white"
- width="290">
+ width="280">
Description:
</text>
<text_editor
follows="left|top|right"
height="100"
- width="290"
+ width="280"
hide_scrollbar="false"
layout="topleft"
left="10"
@@ -132,27 +131,26 @@
length="1"
font="SansSerifSmall"
font.style="BOLD"
- follows="left|top"
+ follows="left|top|right"
height="15"
layout="topleft"
left="10"
name="location_label"
text_color="white"
top_pad="20"
- width="290">
+ width="280">
Location:
</text>
<text
type="string"
length="1"
- follows="left|top"
+ follows="left|top|right"
height="50"
layout="topleft"
left="10"
name="pick_location"
- right="-10"
top_pad="2"
- width="290"
+ width="280"
word_wrap="true">
loading...
</text>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index f68202d287..9c7f38e688 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -40,31 +40,30 @@
left="10"
top_pad="10"
name="profile_scroll"
- reserve_scroll_corner="false"
width="313">
<panel
name="scroll_content_panel"
- follows="left|top"
+ follows="left|top|right"
min_height="300"
layout="topleft"
top="0"
background_visible="false"
- height="470"
+ height="400"
left="0"
- width="295">
+ width="285">
<texture_picker
enabled="false"
- follows="left|top"
+ follows="left|top|right"
height="197"
layout="topleft"
left="10"
name="pick_snapshot"
top="20"
- width="290" />
+ width="280" />
<text
follows="left|top|right"
height="35"
- width="290"
+ width="280"
layout="topleft"
font="SansSerifBig"
font.style="BOLD"
@@ -75,23 +74,29 @@
value="[name]"
use_ellipses="true" />
<text
- follows="left|top"
+ follows="left|top|right"
height="25"
layout="topleft"
left="10"
name="pick_location"
- width="290"
+ width="280"
word_wrap="true"
value="[loading...]" />
- <text
- follows="left|top|right"
- height="280"
+ <text_editor
+ bg_readonly_color="DkGray2"
+ follows="all"
+ height="100"
+ width="280"
+ hide_scrollbar="false"
layout="topleft"
left="10"
+ top_pad="2"
+ max_length="1023"
name="pick_desc"
- width="290"
+ read_only="true"
+ text_readonly_color="white"
value="[description]"
- word_wrap="true" />
+ wrap="true" />
</panel>
</scroll_container>
<panel