diff options
| author | Richard Linden <none@none> | 2011-09-23 17:01:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-09-23 17:01:15 -0700 |
| commit | b6d7f99f065c87f7409a1e5e1ba1b59f3f4a3efb (patch) | |
| tree | 88cb3ace73821f78fca959a6dc4279489887dc99 /indra/newview/skins/default | |
| parent | 0c5d69b662b97d7716c2b00baccd112eb1c6ec98 (diff) | |
EXP-1239 FIX make toolbars wrap when there is not enough room
spacing between buttons now configurable and correct
background art now wraps buttons correctly
created customizable panel for button background
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_toolbar.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/toolbar.xml | 17 |
2 files changed, 15 insertions, 6 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 da964b88e2..b58c006b3f 100644 --- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml +++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml @@ -28,7 +28,7 @@ <toolbar name="test_toolbar_left" follows="left|bottom|top" height="380" - width="100" + width="200" left="0" top="70" min_button_width="100" @@ -43,7 +43,7 @@ <toolbar name="test_toolbar_right" follows="right|bottom|top" height="380" - width="100" + width="200" right="500" top="70" side="right"> diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml index f9cc9b7c69..45210277b2 100644 --- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml +++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml @@ -1,11 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<toolbar background_image = "Rounded_Rect" - button_height="30"> - <button_icon_and_text follows="none" +<toolbar button_height="30" + pad_left="5" + pad_right="5" + pad_top="5" + pad_bottom="5" + pad_between="5"> + + <button_panel name="button_panel" + bg_opaque_image="Rounded_Rect" + background_visible="true" + background_opaque="true"/> + <button_icon_and_text follows="left|top" chrome="true" use_ellipses="true" auto_resize="true"/> - <button_icon follows="none" + <button_icon follows="left|top" chrome="true" use_ellipses="true" auto_resize="true"/> |