diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2010-12-04 13:07:51 +0200 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2010-12-04 13:07:51 +0200 |
| commit | b9fa0e9bbe0db5ecdfb5fbdd88474e0d3bb8eed2 (patch) | |
| tree | 11d22fbc694ed084e707198fd72c4179091f7b2a /indra/llui | |
| parent | d0ec374e15c5a5a8edf59441d8b8350daeb8285b (diff) | |
STORM-717 FIXED Made nearby chat toasts respect transparency settings:
* Normally toasts are as opaque as specified by "inactive floater opacity" setting.
* When mouse is hovering a toast, the toast uses "active floater opacity" setting.
* Fading toasts have 1/2 of "inactive floater opacity".
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lluictrl.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/lluictrl.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp index 7e4cb78d80..afd60cbb3e 100644 --- a/indra/llui/lluictrl.cpp +++ b/indra/llui/lluictrl.cpp @@ -944,6 +944,10 @@ F32 LLUICtrl::getCurrentTransparency() case TT_INACTIVE: alpha = sInactiveControlTransparency; break; + + case TT_FADING: + alpha = sInactiveControlTransparency / 2; + break; } return alpha; diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h index a78f98ac76..b37e9f6b1b 100644 --- a/indra/llui/lluictrl.h +++ b/indra/llui/lluictrl.h @@ -123,8 +123,9 @@ public: enum ETypeTransparency { TT_DEFAULT, - TT_ACTIVE, - TT_INACTIVE + TT_ACTIVE, // focused floater + TT_INACTIVE, // other floaters + TT_FADING, // fading toast }; /*virtual*/ ~LLUICtrl(); |