diff options
| author | Richard Linden <none@none> | 2012-01-30 18:32:35 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-30 18:32:35 -0800 |
| commit | f3ddb75b0373f22fe0bb2f46b0a30f018bddc0ee (patch) | |
| tree | adb128a04e308d920f96e5773d15cf47c661dc64 /indra/newview/skins/default/xui/en | |
| parent | 3249a1ced0a4d0bc45d04f5794c989e12e62033b (diff) | |
EXP-1851 WIP Crash when trying to resize the bottom sections
fixed layout logic when dealing with invisibile layout_panels
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_layout_stacks.xml | 14 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 2 |
2 files changed, 13 insertions, 3 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 f95f21e63a..f4ef63e73e 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 @@ -32,6 +32,16 @@ bg_alpha_color="blue" height="11" min_height="0" + visible="false" + 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> @@ -51,7 +61,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" @@ -59,7 +69,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" diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 1e06a60f55..29e27cb146 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -48,7 +48,7 @@ height="300" width="330" /> </layout_panel> - <layout_panel + <layout_panel width="330" layout="topleft" auto_resize="true" |