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

EXP-1396 FIX -- Local chat toasts appear is upper left corner, reviewed by Richard.

master
Leslie Linden 2011-10-17 13:55:37 -07:00
parent a2e32429bb
commit 795695a2db
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llnearbychathandler.cpp
View File

@ -384,9 +384,9 @@ void LLNearbyChatScreenChannel::arrangeToasts()
channel_rect.mLeft += 10;
channel_rect.mRight = channel_rect.mLeft + 300;
S32 channel_top = channel_rect.mTop;
S32 channel_bottom = channel_rect.mBottom;
S32 top = channel_top - 10;
S32 bottom = channel_bottom + 10;
S32 margin = gSavedSettings.getS32("ToastGap");
//sort active toasts
@ -403,9 +403,9 @@ void LLNearbyChatScreenChannel::arrangeToasts()
continue;
}
S32 toast_bottom = top - toast->getRect().getHeight() - margin;
S32 toast_top = bottom + toast->getRect().getHeight() + margin;
if(toast_bottom < channel_rect.mBottom)
if(toast_top > channel_rect.getHeight())
{
while(it!=m_active_toasts.end())
{
@ -416,10 +416,10 @@ void LLNearbyChatScreenChannel::arrangeToasts()
}
toast_rect = toast->getRect();
toast_rect.setOriginAndSize(channel_rect.mLeft , toast_bottom, toast_rect.getWidth() ,toast_rect.getHeight());
toast_rect.setLeftTopAndSize(channel_rect.mLeft , bottom + toast_rect.getHeight(), toast_rect.getWidth() ,toast_rect.getHeight());
toast->setRect(toast_rect);
top -= toast_rect.getHeight() - toast->getTopPad() + margin;
bottom += toast_rect.getHeight() - toast->getTopPad() + margin;
}
// use reverse order to provide correct z-order and avoid toast blinking