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

implemented EXT-3341 “URLs should be clickable in the IM toasts”, 

replaced mouseDown callback with handleMouseDown method to provide possibility
to separate mouse down event on panel and in panel children;

--HG--
branch : product-engine
meow-7.2.2
Alexei Arabadji 2009-12-10 18:39:06 +02:00
parent a7e9fcc132
commit 5c1cea1e76
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/lltoastimpanel.cpp
View File

@ -85,7 +85,6 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) : LLToastPanel(p.notif
sys_msg_icon->setVisible(FALSE);
mAvatar->setValue(p.avatar_id);
setMouseDownCallback(boost::bind(&LLToastIMPanel::onClickToastIM, this));
}
S32 maxLinesCount;
@ -102,11 +101,13 @@ LLToastIMPanel::~LLToastIMPanel()
{
}
//--------------------------------------------------------------------------
void LLToastIMPanel::onClickToastIM()
//virtual
BOOL LLToastIMPanel::handleMouseDown(S32 x, S32 y, MASK mask)
{
mNotification->respond(mNotification->getResponseTemplate());
if (LLPanel::handleMouseDown(x,y,mask) == FALSE)
{
mNotification->respond(mNotification->getResponseTemplate());
}
return TRUE;
}
//--------------------------------------------------------------------------

4
indra/newview/lltoastimpanel.h
View File

@ -57,12 +57,10 @@ public:
LLToastIMPanel(LLToastIMPanel::Params &p);
virtual ~LLToastIMPanel();
/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
private:
static const S32 DEFAULT_MESSAGE_MAX_LINE_COUNT;
void onClickToastIM();
LLNotificationPtr mNotification;
LLUUID mSessionID;
LLAvatarIconCtrl* mAvatar;