diff options
| author | Richard Nelson <richard@lindenlab.com> | 2009-10-05 20:53:51 +0000 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2009-10-05 20:53:51 +0000 |
| commit | 8f4df3a68f9446b8a0c65e49170522e14e0dc703 (patch) | |
| tree | 82c902b8c0ef476f4f68f67ab72bb3e86551d515 /indra/newview/skins/default | |
| parent | 440a0500723b4dec14a57202e89623ff91e34b1b (diff) | |
text boxes are now *not* mouse_opaque by default
fixed some textbox and text editor layout problems (getWidth called with wrong index)
EXT-1302 - rewrite LLExpandableTextBox to use new LLTextBase functionality (using custom LLExpanderSegment)
reviewed by James
Diffstat (limited to 'indra/newview/skins/default')
4 files changed, 9 insertions, 15 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index 5a29c6a319..8ed2047a27 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -316,13 +316,16 @@ height="40" follows="top|left|bottom" layout="topleft" - name="test_text_editor" + name="test_text_box" tool_tip="text box" top_pad="5" width="200"> Text box with multiple lines +and too +many +line to actually fit </text> <!-- And a third column --> diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index b4212aaa34..9cf699ad46 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -43,7 +43,7 @@ layout="topleft" top="0" left="0" - width="284" + width="300" height="700"> <panel follows="left|top" @@ -52,7 +52,7 @@ left="10" name="second_life_image_panel" top="10" - width="280"> + width="285"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -94,7 +94,7 @@ top_pad="10" left="10" name="first_life_image_panel" - width="280"> + width="285"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -122,7 +122,7 @@ height="90" layout="topleft" name="fl_description_edit" - width="180" + width="170" expanded_bg_visible="true" expanded_bg_color="black"> Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. diff --git a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml index bcfc2f6472..e470f42d36 100644 --- a/indra/newview/skins/default/xui/en/widgets/expandable_text.xml +++ b/indra/newview/skins/default/xui/en/widgets/expandable_text.xml @@ -9,16 +9,6 @@ tab_stop="true" v_pad="2" h_pad="3" > - <expand_textbox - name="expand" - follows="bottom|right" - visible="false" - bg_visible="false" - tab_stop="false" - v_pad="0" - h_pad="0" - text="[http://www.DUMMY.com More]" - tool_tip="Click to expand text"/> </textbox> <scroll name="scroll" diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 7d78a8fa20..f0127a9d5a 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <text allow_html="true" clip_to_rect="false" + mouse_opaque="false" name="text_box" font="SansSerifSmall" font_shadow="soft" |