Skip to content
Snippets Groups Projects
Commit 1718ca48 authored by Vadim ProductEngine's avatar Vadim ProductEngine
Browse files

STORM-511 FIXED Display tooltip for sender name on group notices.

Changes:
* Set tooltip for sender name.
* Overridden handleTooltip() for the tooltip to be of normal (yellow) color.
parent 452d9d5e
No related branches found
No related tags found
No related merge requests found
...@@ -46,6 +46,7 @@ class LLInspectToast: public LLInspect ...@@ -46,6 +46,7 @@ class LLInspectToast: public LLInspect
virtual ~LLInspectToast(); virtual ~LLInspectToast();
/*virtual*/ void onOpen(const LLSD& notification_id); /*virtual*/ void onOpen(const LLSD& notification_id);
/*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);
private: private:
void onToastDestroy(LLToast * toast); void onToastDestroy(LLToast * toast);
...@@ -73,6 +74,7 @@ LLInspectToast::~LLInspectToast() ...@@ -73,6 +74,7 @@ LLInspectToast::~LLInspectToast()
LLTransientFloaterMgr::getInstance()->removeControlView(this); LLTransientFloaterMgr::getInstance()->removeControlView(this);
} }
// virtual
void LLInspectToast::onOpen(const LLSD& notification_id) void LLInspectToast::onOpen(const LLSD& notification_id)
{ {
LLInspect::onOpen(notification_id); LLInspect::onOpen(notification_id);
...@@ -103,6 +105,15 @@ void LLInspectToast::onOpen(const LLSD& notification_id) ...@@ -103,6 +105,15 @@ void LLInspectToast::onOpen(const LLSD& notification_id)
LLUI::positionViewNearMouse(this); LLUI::positionViewNearMouse(this);
} }
// virtual
BOOL LLInspectToast::handleToolTip(S32 x, S32 y, MASK mask)
{
// We don't like the way LLInspect handles tooltips
// (black tooltips look weird),
// so force using the default implementation (STORM-511).
return LLFloater::handleToolTip(x, y, mask);
}
void LLInspectToast::onToastDestroy(LLToast * toast) void LLInspectToast::onToastDestroy(LLToast * toast)
{ {
closeFloater(false); closeFloater(false);
......
...@@ -77,6 +77,7 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification ...@@ -77,6 +77,7 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(LLNotificationPtr& notification
from << from_name << "/" << groupData.mName; from << from_name << "/" << groupData.mName;
LLTextBox* pTitleText = getChild<LLTextBox>("title"); LLTextBox* pTitleText = getChild<LLTextBox>("title");
pTitleText->setValue(from.str()); pTitleText->setValue(from.str());
pTitleText->setToolTip(from.str());
//message subject //message subject
const std::string& subject = payload["subject"].asString(); const std::string& subject = payload["subject"].asString();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment