diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-12-08 13:24:37 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-12-08 13:24:37 +0200 |
| commit | 7348fbb69af095f073da5ec9bd25c690c80b93f5 (patch) | |
| tree | d0a0af4bdd760de51712ffd32a80e7d4ffcc7516 /indra | |
| parent | d36b993e92bb8a69d32407a42b67adf40f1a75ab (diff) | |
Completed normal task EXT-3147 (Implement new states for message indicators)
-- Implemented 4 states of button by its background images via force Pressed state. They are:
--- xml attribute Description
--- image_unselected "Unlit" - there are no new messages
--- image_selected "Unlit" + "Selected" - there are no new messages and the Well is open
--- image_pressed "Lit" - there are new messages
--- image_pressed_selected "Lit" + "Selected" - there are new messages and the Well is open
--HG--
branch : product-engine
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llchiclet.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_bottomtray.xml | 8 |
2 files changed, 18 insertions, 0 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 6d37eaed3d..bd8effd93d 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -120,6 +120,16 @@ void LLSysWellChiclet::setCounter(S32 counter) mButton->setLabel(s_count); mCounter = counter; + + /* + Emulate 4 states of button by background images, see detains in EXT-3147 + xml attribute Description + image_unselected "Unlit" - there are no new messages
+ image_selected "Unlit" + "Selected" - there are no new messages and the Well is open
+ image_pressed "Lit" - there are new messages
+ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well is open + */ + mButton->setForcePressedState(counter > 0); } boost::signals2::connection LLSysWellChiclet::setClickCallback( diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index c8c5bc688e..fc6f4966c4 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -331,6 +331,14 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. name="im_well" top="4" width="34"> + <!-- +Emulate 4 states of button by background images, see detains in EXT-3147. The same should be for notification_well button +xml attribute Description +image_unselected "Unlit" - there are no new messages +image_selected "Unlit" + "Selected" - there are no new messages and the Well is open +image_pressed "Lit" - there are new messages +image_pressed_selected "Lit" + "Selected" - there are new messages and the Well is open + --> <button auto_resize="true" flash_color="EmphasisColor" |