diff options
| author | Leslie Linden <none@none> | 2011-06-07 13:57:19 -0700 |
|---|---|---|
| committer | Leslie Linden <none@none> | 2011-06-07 13:57:19 -0700 |
| commit | 1aed9849285b574346087eb5ac7e0c8038fa21fe (patch) | |
| tree | 63bed798da119dc094a360c88a02874a22d365d2 /indra/newview/skins | |
| parent | 98bcd9e2efe4cc0dc5e51da09c6f18424b9d9144 (diff) | |
EXP-865 PROGRESS -- Modify LLBadge to allow it to hang off of non-buttons
Added the following for increased LLBadge functionality:
* Panels now choose whether or not they accept buttons as children, which they
do by default.
* UI controls now shuffle controls with "requests_front" to the front of their
children list at postBuild time.
* Badges are set to "requests_front" by default
* Badges now accept border image and color attributes
Reviewed by Callum
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/colors.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/badge.xml | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/panel.xml | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index a548849d60..efd2559a55 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -136,7 +136,7 @@ name="BadgeImageColor" value="0.44 0.69 0.56 1.0" /> <color - name="BadgeImageBorderColor" + name="BadgeBorderColor" value="0.9 0.9 0.9 1.0" /> <color name="BadgeLabelColor" diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml index ceec09d1e4..f77c4b7178 100644 --- a/indra/newview/skins/default/xui/en/widgets/badge.xml +++ b/indra/newview/skins/default/xui/en/widgets/badge.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Additional attributes: --> -<badge font="SansSerifSmall" +<badge border_image="Badge_Border" + border_color="BadgeBorderColor" + font="SansSerifSmall" image="Badge_Background" image_color="BadgeImageColor" label_color="BadgeLabelColor" @@ -10,5 +12,6 @@ location_percent_vcenter="85" padding_horiz="7" padding_vert="4" + requests_front="true" > </badge> diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml index 9bf99fa363..47a210d9b7 100644 --- a/indra/newview/skins/default/xui/en/widgets/panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/panel.xml @@ -10,4 +10,5 @@ bg_alpha_image_overlay="White" background_visible="false" background_opaque="false" - chrome="false"/>
\ No newline at end of file + chrome="false" + accepts_badge="true"/>
\ No newline at end of file |