diff options
| author | Richard Linden <none@none> | 2011-09-22 17:34:42 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-09-22 17:34:42 -0700 |
| commit | c155483fc206768e21d180fac9ccdd85db8f582e (patch) | |
| tree | e6341800a5a66e1799c682a6dddbdff090c10417 /indra/newview/skins | |
| parent | 6c209d0fc8c8b171262074e1970c4e9ff299f9f0 (diff) | |
EXP-1239 WIP make toolbars wrap when there is not enough room
toolbar button height configured by button_height attribute
vertical toolbar buttons now share common width
wrap attribute now controls wrapping
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_toolbar.xml | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/toolbar.xml | 23 |
2 files changed, 16 insertions, 17 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 85f0f104fc..da964b88e2 100644 --- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml +++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml @@ -13,13 +13,16 @@ width="500" left="0" top="20" - min_width="100" + min_button_width="0" + max_button_width="100" side="top"> <button auto_resize="true" + use_ellipses="true" label="Button"/> <button auto_resize="true" label="Button with long label"/> <button auto_resize="true" + use_ellipses="true" label="Button with longest label of all"/> </toolbar> <toolbar name="test_toolbar_left" @@ -28,7 +31,7 @@ width="100" left="0" top="70" - min_width="100" + min_button_width="100" side="left"> <button height="30" label="Button"/> @@ -43,7 +46,6 @@ width="100" right="500" top="70" - min_width="100" side="right"> <button auto_resize="true" label="Button 1"/> @@ -58,7 +60,7 @@ width="500" left="0" bottom="500" - min_width="100" + min_button_width="100" side="bottom"> <button auto_resize="true" label="Button"/> diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml index a7f73c0c7c..f9cc9b7c69 100644 --- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml +++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml @@ -1,15 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<toolbar background_image = "Rounded_Rect"> - <button_icon_and_text - follows="none" - height="30" - chrome="true" - auto_resize="true" - /> - <button_icon - follows="none" - height="30" - chrome="true" - auto_resize="true" - /> +<toolbar background_image = "Rounded_Rect" + button_height="30"> + <button_icon_and_text follows="none" + chrome="true" + use_ellipses="true" + auto_resize="true"/> + <button_icon follows="none" + chrome="true" + use_ellipses="true" + auto_resize="true"/> </toolbar> |