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

MAINT-6377 Nearby chat toasts cover the conversation floater.

meow-7.2.2
Mnikolenko Productengine 2016-05-18 13:15:01 +03:00
parent e3afb1fdba
commit 191c2aec49
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llfloaterimnearbychathandler.cpp
View File

@ -601,12 +601,31 @@ void LLFloaterIMNearbyChatHandler::processChat(const LLChat& chat_msg,
toast_msg = chat_msg.mText;
}
bool chat_overlaps = false;
if(nearby_chat->getChatHistory())
{
LLRect chat_rect = nearby_chat->getChatHistory()->calcScreenRect();
for (std::list<LLView*>::const_iterator child_iter = gFloaterView->getChildList()->begin();
child_iter != gFloaterView->getChildList()->end(); ++child_iter)
{
LLView *view = *child_iter;
const LLRect& rect = view->getRect();
if(view->isInVisibleChain() && (rect.overlaps(chat_rect)))
{
if(!nearby_chat->getChatHistory()->hasAncestor(view))
{
chat_overlaps = true;
}
break;
}
}
}
//Don't show nearby toast, if conversation is visible and selected
if ((nearby_chat->hasFocus()) ||
(LLFloater::isVisible(nearby_chat) && nearby_chat->isTornOff() && !nearby_chat->isMinimized()) ||
((im_box->getSelectedSession().isNull() &&
((LLFloater::isVisible(im_box) && !im_box->isMinimized() && im_box->isFrontmost())
|| (LLFloater::isVisible(nearby_chat) && !nearby_chat->isMinimized() && nearby_chat->isFrontmost())))))
((im_box->getSelectedSession().isNull() && !chat_overlaps &&
((LLFloater::isVisible(im_box) && !nearby_chat->isTornOff() && !im_box->isMinimized())
|| (LLFloater::isVisible(nearby_chat) && nearby_chat->isTornOff() && !nearby_chat->isMinimized())))))
{
if(nearby_chat->isMessagePaneExpanded())
{

6
indra/newview/llfloaterimsessiontab.cpp
View File

@ -1094,6 +1094,12 @@ void LLFloaterIMSessionTab::saveCollapsedState()
gSavedPerAccountSettings.setBOOL("NearbyChatIsNotCollapsed", isMessagePaneExpanded());
}
}
LLView* LLFloaterIMSessionTab::getChatHistory()
{
return mChatHistory;
}
BOOL LLFloaterIMSessionTab::handleKeyHere(KEY key, MASK mask )
{
BOOL handled = FALSE;

2
indra/newview/llfloaterimsessiontab.h
View File

@ -103,6 +103,8 @@ public:
void restoreFloater();
void saveCollapsedState();
LLView* getChatHistory();
protected:
// callback for click on any items of the visual states menu