summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-09-21 18:48:39 -0700
committerRichard Nelson <richard@lindenlab.com>2011-09-21 18:48:39 -0700
commit7e308b551c7fde9178e354dba005a5b35f793245 (patch)
tree76117996ab01ccabce4810badebad6a2d468d002 /indra/newview/skins
parentf72115059e7b1450e221a8006d2030ac35767b5a (diff)
EXP-1239 WIP make toolbars wrap when there is not enough room
initial pass at wrapping
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_toolbar.xml13
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index 55cfd462ac..138322eca7 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -13,15 +13,12 @@
width="500"
left="0"
top="20"
- orientation="horizontal">
- <button width="0"
- auto_resize="true"
+ side="top">
+ <button auto_resize="true"
label="Button 1"/>
- <button width="0"
- auto_resize="true"
+ <button auto_resize="true"
label="Button with long label"/>
- <button width="0"
- auto_resize="true"
+ <button auto_resize="true"
label="Button with longest label of all"/>
</toolbar>
<toolbar name="test_toolbar_vertical"
@@ -30,7 +27,7 @@
width="100"
left="0"
top="70"
- orientation="vertical">
+ side="left">
<button height="30"
label="Button 1"/>
<button height="50"