summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2010-12-09 17:30:18 +0200
committerVadim ProductEngine <vsavchuk@productengine.com>2010-12-09 17:30:18 +0200
commitf3d65643e533472c593ef013b4bb1dd644b85806 (patch)
tree591ecba8e8e548971fb69fa95177f51e864582b2
parent80058f35edddc40c8e435c6b31d437776e632b2b (diff)
STORM-774 WIP Partially reverted transparency fix for nearby chat toasts (STORM-717) to develop a more generic one (applicable to all notification toasts).
-rw-r--r--indra/newview/llnearbychathandler.cpp39
-rw-r--r--indra/newview/lltoast.h8
2 files changed, 3 insertions, 44 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index dfbbaa0941..d2ad78f140 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -165,20 +165,11 @@ public:
: LLToast(p),
mNearbyChatScreenChannelp(nc_channelp)
{
- updateTransparency();
- setMouseEnterCallback(boost::bind(&LLNearbyChatToast::updateTransparency, this));
- setMouseLeaveCallback(boost::bind(&LLNearbyChatToast::updateTransparency, this));
}
/*virtual*/ void onClose(bool app_quitting);
- /*virtual*/ void setBackgroundOpaque(BOOL b);
-
-protected:
- /*virtual*/ void setTransparentState(bool transparent);
private:
- void updateTransparency();
-
LLNearbyChatScreenChannel* mNearbyChatScreenChannelp;
};
@@ -606,34 +597,4 @@ void LLNearbyChatToast::onClose(bool app_quitting)
mNearbyChatScreenChannelp->onToastDestroyed(this, app_quitting);
}
-// virtual
-void LLNearbyChatToast::setBackgroundOpaque(BOOL b)
-{
- // We don't want background changes: transparency is handled differently.
- LLToast::setBackgroundOpaque(TRUE);
-}
-
-// virtual
-void LLNearbyChatToast::setTransparentState(bool transparent)
-{
- LLToast::setTransparentState(transparent);
- updateTransparency();
-}
-
-void LLNearbyChatToast::updateTransparency()
-{
- ETypeTransparency transparency_type;
-
- if (isHovered())
- {
- transparency_type = TT_ACTIVE;
- }
- else
- {
- transparency_type = getTransparentState() ? TT_FADING : TT_INACTIVE;
- }
-
- LLFloater::updateTransparency(transparency_type);
-}
-
// EOF
diff --git a/indra/newview/lltoast.h b/indra/newview/lltoast.h
index d23e858c5c..f88c628631 100644
--- a/indra/newview/lltoast.h
+++ b/indra/newview/lltoast.h
@@ -141,7 +141,7 @@ public:
//
virtual void setVisible(BOOL show);
- virtual void setBackgroundOpaque(BOOL b);
+ /*virtual*/ void setBackgroundOpaque(BOOL b);
//
virtual void hide();
@@ -198,10 +198,6 @@ public:
LLHandle<LLToast> getHandle() { mHandle.bind(this); return mHandle; }
- bool getTransparentState() const { return mIsTransparent; }
- virtual void setTransparentState(bool transparent);
-
-
private:
void onToastMouseEnter();
@@ -210,6 +206,8 @@ private:
void expire();
+ void setTransparentState(bool transparent);
+
LLUUID mNotificationID;
LLUUID mSessionID;
LLNotificationPtr mNotification;