diff options
author | Richard Linden <none@none> | 2011-09-22 15:08:59 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-09-22 15:08:59 -0700 |
commit | 00f66ccf409b0f7fb974f23cd157cdd0b8a6ab96 (patch) | |
tree | a796e9223cce833e7ff779e3cd187e364de1e72e /indra/newview/skins | |
parent | e70714fcfec5617d6458df48746cac95ab2b7198 (diff) |
EXP-1239 WIP make toolbars wrap when there is not enough room
added more toolbars to floater_test_toolbar.xml
removed layout stack and got basic wrapping working
reviewed by Leslie
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_toolbar.xml | 47 |
1 files changed, 39 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 138322eca7..85f0f104fc 100644 --- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml +++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml @@ -7,33 +7,64 @@ name="floater_test_toolbar" translate="false" width="500"> - <toolbar name="test_toolbar_horizontal" + <toolbar name="test_toolbar_top" follows="left|right|top" height="50" width="500" left="0" top="20" + min_width="100" side="top"> <button auto_resize="true" - label="Button 1"/> + label="Button"/> <button auto_resize="true" label="Button with long label"/> <button auto_resize="true" label="Button with longest label of all"/> </toolbar> - <toolbar name="test_toolbar_vertical" + <toolbar name="test_toolbar_left" follows="left|bottom|top" - height="430" + height="380" width="100" left="0" top="70" + min_width="100" side="left"> <button height="30" - label="Button 1"/> + label="Button"/> <button height="50" - label="Button 2"/> + label="Button with long label"/> <button height="60" - label="Button 3"/> + label="Button with longest label of all"/> + </toolbar> + <toolbar name="test_toolbar_right" + follows="right|bottom|top" + height="380" + width="100" + right="500" + top="70" + min_width="100" + side="right"> + <button auto_resize="true" + label="Button 1"/> + <button auto_resize="true" + label="Button with long label"/> + <button auto_resize="true" + label="Button with longest label of all"/> + </toolbar> + <toolbar name="test_toolbar_bottom" + follows="left|right|bottom" + height="50" + width="500" + left="0" + bottom="500" + min_width="100" + side="bottom"> + <button auto_resize="true" + label="Button"/> + <button auto_resize="true" + label="Button with long label"/> + <button auto_resize="true" + label="Button with longest label of all"/> </toolbar> - </floater> |