livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-774 FIXED Made notification toasts (e.g. IM 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".
master
Vadim ProductEngine 2010-12-09 17:30:31 +02:00
parent c78db88d06
commit 0308dbeda7
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
indra/newview/lltoast.cpp
View File

@ -125,6 +125,9 @@ LLToast::LLToast(const LLToast::Params& p)
mWrapperPanel->setMouseEnterCallback(boost::bind(&LLToast::onToastMouseEnter, this));
mWrapperPanel->setMouseLeaveCallback(boost::bind(&LLToast::onToastMouseLeave, this));
setBackgroundOpaque(TRUE); // *TODO: obsolete
updateTransparency();
if(mPanel)
{
insertPanel(mPanel);
@ -190,7 +193,7 @@ void LLToast::onFocusLost()
if(mWrapperPanel && !isBackgroundVisible())
{
// Lets make wrapper panel behave like a floater
setBackgroundOpaque(FALSE);
updateTransparency();
}
}
@ -199,7 +202,7 @@ void LLToast::onFocusReceived()
if(mWrapperPanel && !isBackgroundVisible())
{
// Lets make wrapper panel behave like a floater
setBackgroundOpaque(TRUE);
updateTransparency();
}
}
@ -260,8 +263,8 @@ void LLToast::expire()
void LLToast::setFading(bool transparent)
{
setBackgroundOpaque(!transparent);
mIsFading = transparent;
updateTransparency();
if (transparent)
{
@ -349,7 +352,6 @@ void LLToast::setVisible(BOOL show)
if(show)
{
setBackgroundOpaque(TRUE);
if(!mTimer->getStarted() && mCanFade)
{
mTimer->start();
@ -391,7 +393,7 @@ void LLToast::onToastMouseEnter()
{
mOnToastHoverSignal(this, MOUSE_ENTER);
setBackgroundOpaque(TRUE);
updateTransparency();
//toasts fading is management by Screen Channel
@ -420,6 +422,8 @@ void LLToast::onToastMouseLeave()
{
mOnToastHoverSignal(this, MOUSE_LEAVE);
updateTransparency();
//toasts fading is management by Screen Channel
if(mHideBtn && mHideBtn->getEnabled())
@ -447,6 +451,31 @@ void LLToast::setBackgroundOpaque(BOOL b)
}
}
void LLToast::updateTransparency()
{
ETypeTransparency transparency_type;
if (mCanFade)
{
// Notification toasts (including IM/chat toasts) change their transparency on hover.
if (isHovered())
{
transparency_type = TT_ACTIVE;
}
else
{
transparency_type = mIsFading ? TT_FADING : TT_INACTIVE;
}
}
else
{
// Transparency of alert toasts depends on focus.
transparency_type = hasFocus() ? TT_ACTIVE : TT_INACTIVE;
}
LLFloater::updateTransparency(transparency_type);
}
void LLNotificationsUI::LLToast::stopTimer()
{
if(mCanFade)

3
indra/newview/lltoast.h
View File

@ -198,6 +198,9 @@ public:
LLHandle<LLToast> getHandle() { mHandle.bind(this); return mHandle; }
protected:
void updateTransparency();
private:
void onToastMouseEnter();