summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-01-31 15:34:32 -0800
committerRichard Linden <none@none>2012-01-31 15:34:32 -0800
commit20b46ef6f626c8c7960a4b9c02cae518448497b7 (patch)
tree87590c216d43eaf5ec081a98b2dbabd6da75e075 /indra/newview
parentf3ddb75b0373f22fe0bb2f46b0a30f018bddc0ee (diff)
EXP-1851 FIX Crash when trying to resize the bottom sections
more layout logic fixes and added renormalization to fractional sizes to eliminate drift
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml14
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
index f4ef63e73e..a04050e7eb 100644
--- a/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml
@@ -42,6 +42,16 @@
bg_alpha_color="blue"
height="11"
min_height="0"
+ visible="true"
+ background_visible="true">
+ <text follows="top|left|right" halign="center" text_color="white">flex</text>
+ </layout_panel>
+ <layout_panel name="flex"
+ auto_resize="true"
+ user_resize="true"
+ bg_alpha_color="blue"
+ height="11"
+ min_height="0"
background_visible="true">
<text follows="top|left|right" halign="center" text_color="white">flex</text>
</layout_panel>
@@ -61,7 +71,7 @@
background_visible="true">
<text follows="top|left|right" halign="center" text_color="white">flex</text>
</layout_panel>
- <!--<layout_panel name="flex"
+ <layout_panel name="flex"
auto_resize="true"
user_resize="true"
visible="false"
@@ -69,7 +79,7 @@
height="100"
background_visible="true">
<text follows="top|left|right" halign="center" text_color="white">flex</text>
- </layout_panel>-->
+ </layout_panel>
<layout_panel name="fixed"
auto_resize="false"
user_resize="true"