1 files changed, 177 insertions, 136 deletions

diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index 63b9fd8e66..81edb55f93 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -44,27 +44,12 @@
 #include "llviewercontrol.h"
 #include "llagentdata.h"
 
-/*
-static const S32 BORDER_MARGIN = 2;
-static const S32 PARENT_BORDER_MARGIN = 0;
-
-static const S32 HORIZONTAL_MULTIPLE = 8;
-static const S32 VERTICAL_MULTIPLE = 16;
-static const F32 MIN_AUTO_SCROLL_RATE = 120.f;
-static const F32 MAX_AUTO_SCROLL_RATE = 500.f;
-static const F32 AUTO_SCROLL_RATE_ACCEL = 120.f;
-
-#define MAX_CHAT_HISTORY 100
-*/
-
-static const S32 msg_left_offset = 30;
+static const S32 msg_left_offset = 10;
 static const S32 msg_right_offset = 10;
-static const S32 msg_height_pad = 2;
-
-//static LLDefaultChildRegistry::Register<LLChatItemsContainerCtrl>	t2("chat_items_container");
+static const S32 msg_height_pad = 5;
 
 //*******************************************************************************************************************
-//LLChatItemCtrl
+//LLNearbyChatToastPanel
 //*******************************************************************************************************************
 
 LLNearbyChatToastPanel* LLNearbyChatToastPanel::createInstance()
@@ -79,22 +64,22 @@ void	LLNearbyChatToastPanel::reshape		(S32 width, S32 height, BOOL called_from_p
 {
 	LLPanel::reshape(width, height,called_from_parent);
 
-	// *NOTE: we must check if child items exist because reshape is called from the 
-	// LLView::initFromParams BEFORE postBuild is called and child controls are not exist yet
-	LLPanel* caption = findChild<LLPanel>("msg_caption", false);
-	LLChatMsgBox* msg_text = findChild<LLChatMsgBox>("msg_text" ,false);
-	if(caption && msg_text)
-	{
-		LLRect caption_rect = caption->getRect();
-		caption_rect.setLeftTopAndSize( 2, height, width - 4, caption_rect.getHeight());
-		caption->reshape( width - 4, caption_rect.getHeight(), 1);
-		caption->setRect(caption_rect);
-
-		LLRect msg_text_rect = msg_text->getRect();
-		msg_text_rect.setLeftTopAndSize( msg_left_offset, height - caption_rect.getHeight() , width - msg_left_offset - msg_right_offset, height - caption_rect.getHeight());
-		msg_text->reshape( width - msg_left_offset - msg_right_offset, height - caption_rect.getHeight(), 1);
-		msg_text->setRect(msg_text_rect);
-	}
+	LLUICtrl* msg_text = getChild<LLUICtrl>("msg_text", false);
+	LLUICtrl* icon = getChild<LLUICtrl>("avatar_icon", false);
+
+	LLRect msg_text_rect = msg_text->getRect();
+	LLRect avatar_rect = icon->getRect();
+	
+	avatar_rect.setLeftTopAndSize(2,height-2,avatar_rect.getWidth(),avatar_rect.getHeight());
+	icon->setRect(avatar_rect);
+
+
+	msg_text_rect.setLeftTopAndSize( avatar_rect.mRight + msg_left_offset, 
+		height - msg_height_pad, 
+		width - avatar_rect.mRight  - msg_left_offset - msg_right_offset, 
+		height - 2*msg_height_pad);
+	msg_text->reshape( msg_text_rect.getWidth(), msg_text_rect.getHeight(), 1);
+	msg_text->setRect(msg_text_rect);
 }
 
 BOOL LLNearbyChatToastPanel::postBuild()
@@ -102,159 +87,210 @@ BOOL LLNearbyChatToastPanel::postBuild()
 	return LLPanel::postBuild();
 }
 
-
-std::string LLNearbyChatToastPanel::appendTime()
+void LLNearbyChatToastPanel::addMessage(LLSD& notification)
 {
-	time_t utc_time;
-	utc_time = time_corrected();
-	std::string timeStr ="["+ LLTrans::getString("TimeHour")+"]:["
-		+LLTrans::getString("TimeMin")+"] ";
+	std::string		messageText = notification["message"].asString();		// UTF-8 line of text
 
-	LLSD substitution;
+	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text", false);
 
-	substitution["datetime"] = (S32) utc_time;
-	LLStringUtil::format (timeStr, substitution);
+	std::string color_name = notification["text_color"].asString();
+	
+	LLColor4 textColor = LLUIColorTable::instance().getColor(color_name);
+	textColor.mV[VALPHA] =notification["color_alpha"].asReal();
+	
+	S32 font_size = notification["font_size"].asInteger();
 
-	return timeStr;
-}
+	LLFontGL*       messageFont;
+	switch(font_size)
+	{
+		case 0:	messageFont = LLFontGL::getFontSansSerifSmall(); break;
+		default:
+		case 1: messageFont = LLFontGL::getFontSansSerif();	    break;
+		case 2:	messageFont = LLFontGL::getFontSansSerifBig();	break;
+	}
 
+	//append text
+	{
+		LLStyle::Params style_params;
+		style_params.color(textColor);
+		std::string font_name = LLFontGL::nameFromFont(messageFont);
+		std::string font_style_size = LLFontGL::sizeFromFont(messageFont);
+		style_params.font.name(font_name);
+		style_params.font.size(font_style_size);
+
+		int chat_type = notification["chat_type"].asInteger();
+
+		if(notification["chat_style"].asInteger()== CHAT_STYLE_IRC)
+		{
+			style_params.font.style = "ITALIC";
+		}
+		else if( chat_type == CHAT_TYPE_SHOUT)
+		{
+			style_params.font.style = "BOLD";
+		}
+		else if( chat_type == CHAT_TYPE_WHISPER)
+		{
+			style_params.font.style = "ITALIC";
+		}
+		msg_text->appendText(messageText, TRUE, style_params);
+	}
 
+	snapToMessageHeight();
 
-void	LLNearbyChatToastPanel::addText		(const std::string& message)
-{
-	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text", false);
-	msg_text->addText(message);
-	mMessages.push_back(message);
 }
 
 void LLNearbyChatToastPanel::init(LLSD& notification)
 {
-	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
-
-	mText = notification["message"].asString();		// UTF-8 line of text
-	mFromName = notification["from"].asString();	// agent or object name
+	std::string		messageText = notification["message"].asString();		// UTF-8 line of text
+	std::string		fromName = notification["from"].asString();	// agent or object name
 	mFromID = notification["from_id"].asUUID();		// agent id or object id
+	mFromName = fromName;
+	
 	int sType = notification["source"].asInteger();
     mSourceType = (EChatSourceType)sType;
+	
+	std::string color_name = notification["text_color"].asString();
+	
+	LLColor4 textColor = LLUIColorTable::instance().getColor(color_name);
+	textColor.mV[VALPHA] =notification["color_alpha"].asReal();
+	
+	S32 font_size = notification["font_size"].asInteger();
 
-	std::string str_sender;
+	LLFontGL*       messageFont;
+	switch(font_size)
+	{
+		case 0:	messageFont = LLFontGL::getFontSansSerifSmall(); break;
+		default:
+		case 1: messageFont = LLFontGL::getFontSansSerif();	    break;
+		case 2:	messageFont = LLFontGL::getFontSansSerifBig();	break;
+	}
+	
+	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text", false);
 
-	if(gAgentID != mFromID)
-		str_sender = mFromName;
-	else
-		str_sender = LLTrans::getString("You");;
+	msg_text->setText(std::string(""));
 
-	caption->getChild<LLTextBox>("sender_name", false)->setText(str_sender);
-	
-	caption->getChild<LLTextBox>("msg_time", false)->setText(appendTime());
+	if ( notification["chat_style"].asInteger() != CHAT_STYLE_IRC )
+	{
+		std::string str_sender;
 
+		str_sender = fromName;
 
-	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text", false);
-	msg_text->setText(mText);
+		str_sender+=" ";
 
-	LLUICtrl* msg_inspector = caption->getChild<LLUICtrl>("msg_inspector");
-	if(mSourceType != CHAT_SOURCE_AGENT)
-		msg_inspector->setVisible(false);
+		//append user name
+		{
+			LLStyle::Params style_params_name;
 
-	mMessages.clear();
+			LLColor4 userNameColor = LLUIColorTable::instance().getColor("ChatToastAgentNameColor");
 
-	snapToMessageHeight	();
+			style_params_name.color(userNameColor);
 
-	mIsDirty = true;//will set Avatar Icon in draw
-}
+			std::string font_name = LLFontGL::nameFromFont(messageFont);
+			std::string font_style_size = LLFontGL::sizeFromFont(messageFont);
+			style_params_name.font.name(font_name);
+			style_params_name.font.size(font_style_size);
+
+			msg_text->appendText(str_sender, FALSE, style_params_name);
+
+		}
+	}
+
+	//append text
+	{
+		LLStyle::Params style_params;
+		style_params.color(textColor);
+		std::string font_name = LLFontGL::nameFromFont(messageFont);
+		std::string font_style_size = LLFontGL::sizeFromFont(messageFont);
+		style_params.font.name(font_name);
+		style_params.font.size(font_style_size);
+
+		int chat_type = notification["chat_type"].asInteger();
+
+		if(notification["chat_style"].asInteger()== CHAT_STYLE_IRC)
+		{
+			style_params.font.style = "ITALIC";
+		}
+		else if( chat_type == CHAT_TYPE_SHOUT)
+		{
+			style_params.font.style = "BOLD";
+		}
+		else if( chat_type == CHAT_TYPE_WHISPER)
+		{
+			style_params.font.style = "ITALIC";
+		}
+		msg_text->appendText(messageText, FALSE, style_params);
+	}
 
-void	LLNearbyChatToastPanel::setMessage	(const LLChat& chat_msg)
-{
-	LLSD notification;
-	notification["message"] = chat_msg.mText;
-	notification["from"] = chat_msg.mFromName;
-	notification["from_id"] = chat_msg.mFromID;
-	notification["time"] = chat_msg.mTime;
-	notification["source"] = (S32)chat_msg.mSourceType;
 
-	init(notification);
+	snapToMessageHeight();
 
+	mIsDirty = true;//will set Avatar Icon in draw
 }
 
 void	LLNearbyChatToastPanel::snapToMessageHeight	()
 {
 	LLChatMsgBox* text_box = getChild<LLChatMsgBox>("msg_text", false);
-	S32 new_height = text_box->getTextPixelHeight() + msg_height_pad;
+	S32 new_height = llmax (text_box->getTextPixelHeight() + 2*text_box->getVPad() + 2*msg_height_pad, 25);
+	
 	LLRect panel_rect = getRect();
 
-	S32 caption_height = 0;
-	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
-	caption_height = caption->getRect().getHeight();
-
-	panel_rect.setLeftTopAndSize( panel_rect.mLeft, panel_rect.mTop, panel_rect.getWidth(), caption_height + new_height);
+	panel_rect.setLeftTopAndSize( panel_rect.mLeft, panel_rect.mTop, panel_rect.getWidth(), new_height);
 	
-	reshape( getRect().getWidth(), caption_height + new_height, 1);
+	reshape( getRect().getWidth(), getRect().getHeight(), 1);
 	
 	setRect(panel_rect);
 
 }
 
-
-void	LLNearbyChatToastPanel::setWidth(S32 width)
-{
-	LLChatMsgBox* text_box = getChild<LLChatMsgBox>("msg_text", false);
-	text_box->reshape(width - msg_left_offset - msg_right_offset,100/*its not magic number, we just need any number*/);
-
-	LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text", false);
-	if(mText.length())
-		msg_text->setText(mText);
-	
-	for(size_t i=0;i<mMessages.size();++i)
-		msg_text->addText(mMessages[i]);
-
-	setRect(LLRect(getRect().mLeft, getRect().mTop, getRect().mLeft + width	, getRect().mBottom));
-	snapToMessageHeight	();
-}
-
 void LLNearbyChatToastPanel::onMouseLeave			(S32 x, S32 y, MASK mask)
 {
-	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
-	LLUICtrl* msg_inspector = caption->getChild<LLUICtrl>("msg_inspector");
-	msg_inspector->setVisible(false);
 	
 }
 void LLNearbyChatToastPanel::onMouseEnter				(S32 x, S32 y, MASK mask)
 {
 	if(mSourceType != CHAT_SOURCE_AGENT)
 		return;
-	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
-	LLUICtrl* msg_inspector = caption->getChild<LLUICtrl>("msg_inspector");
-	msg_inspector->setVisible(true);
 }
 
 BOOL	LLNearbyChatToastPanel::handleMouseDown	(S32 x, S32 y, MASK mask)
 {
+	return LLPanel::handleMouseDown(x,y,mask);
+}
+
+BOOL	LLNearbyChatToastPanel::handleMouseUp	(S32 x, S32 y, MASK mask)
+{
+	/*
+	fix for request  EXT-4780
+	leaving this commented since I don't remember why ew block those messages...
 	if(mSourceType != CHAT_SOURCE_AGENT)
-		return LLPanel::handleMouseDown(x,y,mask);
-	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
-	LLUICtrl* msg_inspector = caption->getChild<LLUICtrl>("msg_inspector");
-	S32 local_x = x - msg_inspector->getRect().mLeft - caption->getRect().mLeft;
-	S32 local_y = y - msg_inspector->getRect().mBottom - caption->getRect().mBottom;
-	if(msg_inspector->pointInView(local_x, local_y))
-	{
-		LLFloaterReg::showInstance("inspect_avatar", LLSD().insert("avatar_id", mFromID));
-	}
-	else
+		return LLPanel::handleMouseUp(x,y,mask);
+    */
+
+	LLChatMsgBox* text_box = getChild<LLChatMsgBox>("msg_text", false);
+	S32 local_x = x - text_box->getRect().mLeft;
+	S32 local_y = y - text_box->getRect().mBottom;
+	
+	//if text_box process mouse up (ussually this is click on url) - we didn't show nearby_chat.
+	if (text_box->pointInView(local_x, local_y) )
 	{
-		LLFloaterReg::showInstance("nearby_chat",LLSD());
+		if (text_box->handleMouseUp(local_x,local_y,mask) == TRUE)
+			return TRUE;
+		else
+		{
+			LLFloaterReg::showInstance("nearby_chat",LLSD());
+			return FALSE;
+		}
 	}
-	return LLPanel::handleMouseDown(x,y,mask);
+
+	LLFloaterReg::showInstance("nearby_chat",LLSD());
+	return LLPanel::handleMouseUp(x,y,mask);
 }
 
 void	LLNearbyChatToastPanel::setHeaderVisibility(EShowItemHeader e)
 {
-	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
-
-	LLUICtrl* icon = caption->getChild<LLUICtrl>("avatar_icon", false);
-	LLUICtrl* name = caption->getChild<LLUICtrl>("sender_name", false);
-
-	icon->setVisible(e == CHATITEMHEADER_SHOW_ONLY_ICON || e==CHATITEMHEADER_SHOW_BOTH);
-	name->setVisible(e == CHATITEMHEADER_SHOW_ONLY_NAME || e==CHATITEMHEADER_SHOW_BOTH);
+	LLUICtrl* icon = getChild<LLUICtrl>("avatar_icon", false);
+	if(icon)
+		icon->setVisible(e == CHATITEMHEADER_SHOW_ONLY_ICON || e==CHATITEMHEADER_SHOW_BOTH);
 
 }
 
@@ -268,11 +304,10 @@ bool	LLNearbyChatToastPanel::canAddText	()
 
 BOOL	LLNearbyChatToastPanel::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-	LLPanel* caption = getChild<LLPanel>("msg_caption", false);
-	LLUICtrl* avatar_icon = caption->getChild<LLUICtrl>("avatar_icon", false);
+	LLUICtrl* avatar_icon = getChild<LLUICtrl>("avatar_icon", false);
 
-	S32 local_x = x - avatar_icon->getRect().mLeft - caption->getRect().mLeft;
-	S32 local_y = y - avatar_icon->getRect().mBottom - caption->getRect().mBottom;
+	S32 local_x = x - avatar_icon->getRect().mLeft;
+	S32 local_y = y - avatar_icon->getRect().mBottom;
 
 	//eat message for avatar icon if msg was from object
 	if(avatar_icon->pointInView(local_x, local_y) && mSourceType != CHAT_SOURCE_AGENT)
@@ -283,9 +318,15 @@ void LLNearbyChatToastPanel::draw()
 {
 	if(mIsDirty)
 	{
-		LLPanel* caption = findChild<LLPanel>("msg_caption", false);
-		if(caption)
-			caption->getChild<LLAvatarIconCtrl>("avatar_icon", false)->setValue(mFromID);
+		LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon", false);
+		if(icon)
+		{
+			icon->setDrawTooltip(mSourceType == CHAT_SOURCE_AGENT);
+			if(mSourceType == CHAT_SOURCE_AGENT)
+				icon->setValue(mFromID);
+			else
+				icon->setValue(LLSD("OBJECT_Icon"));
+		}
 		mIsDirty = false;
 	}
 	LLToastPanelBase::draw();