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

Fixed bug EXT-3773 (Group chat toasts should have inspectors for names). 

Added on-hover icons to invoke avatar inspector to IM toasts.

--HG--
branch : product-engine
master
Vadim Savchuk 2010-01-28 22:02:31 +02:00
parent 3b0e95bf3c
commit d383adfc92
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
indra/newview/lltoastimpanel.cpp
View File

@ -33,8 +33,11 @@
#include "llviewerprecompiledheaders.h"
#include "lltoastimpanel.h"
#include "llfloaterreg.h"
#include "llnotifications.h"
#include "llinstantmessage.h"
#include "lltooltip.h"
#include "llviewerchat.h"
const S32 LLToastIMPanel::DEFAULT_MESSAGE_MAX_LINE_COUNT = 6;
@ -80,6 +83,7 @@ LLToastIMPanel::LLToastIMPanel(LLToastIMPanel::Params &p) : LLToastPanel(p.notif
mAvatarName->setValue(p.from);
mTime->setValue(p.time);
mSessionID = p.session_id;
mAvatarID = p.avatar_id;
mNotification = p.notification;
if(p.from == SYSTEM_FROM)
@ -119,3 +123,36 @@ BOOL LLToastIMPanel::handleMouseDown(S32 x, S32 y, MASK mask)
return TRUE;
}
//virtual
BOOL LLToastIMPanel::handleToolTip(S32 x, S32 y, MASK mask)
{
// It's not our direct child, so parentPointInView() doesn't work.
LLRect name_rect;
mAvatarName->localRectToOtherView(mAvatarName->getLocalRect(), &name_rect, this);
if (!name_rect.pointInRect(x, y))
return LLToastPanel::handleToolTip(x, y, mask);
// Spawn at right side of the name textbox.
LLRect sticky_rect = mAvatarName->calcScreenRect();
S32 icon_x = llmin(sticky_rect.mLeft + mAvatarName->getTextPixelWidth() + 3, sticky_rect.mRight - 16);
LLCoordGL pos(icon_x, sticky_rect.mTop);
LLToolTip::Params params;
params.background_visible(false);
params.click_callback(boost::bind(&LLToastIMPanel::showInspector, this));
params.delay_time(0.0f); // spawn instantly on hover
params.image(LLUI::getUIImage("Info_Small"));
params.message("");
params.padding(0);
params.pos(pos);
params.sticky_rect(sticky_rect);
LLToolTipMgr::getInstance()->show(params);
return TRUE;
}
void LLToastIMPanel::showInspector()
{
LLFloaterReg::showInstance("inspect_avatar", LLSD().with("avatar_id", mAvatarID));
}

3
indra/newview/lltoastimpanel.h
View File

@ -58,11 +58,14 @@ public:
LLToastIMPanel(LLToastIMPanel::Params &p);
virtual ~LLToastIMPanel();
/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
/*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);
private:
void showInspector();
static const S32 DEFAULT_MESSAGE_MAX_LINE_COUNT;
LLNotificationPtr mNotification;
LLUUID mSessionID;
LLUUID mAvatarID;
LLAvatarIconCtrl* mAvatarIcon;
LLTextBox* mAvatarName;
LLTextBox* mTime;