Skip to content
Snippets Groups Projects
Commit ffa53cf6 authored by Paul ProductEngine's avatar Paul ProductEngine
Browse files

EXP-1333 FIXED (Move IM toasts to upper right and flip vertically)

- Nearby chat toasts flipped vertically
- Fixed notification and IM well floaters docking state saving.
parent 6d1ae4e0
No related branches found
No related tags found
No related merge requests found
......@@ -384,9 +384,9 @@ void LLNearbyChatScreenChannel::arrangeToasts()
channel_rect.mLeft += 10;
channel_rect.mRight = channel_rect.mLeft + 300;
S32 channel_bottom = channel_rect.mBottom;
S32 channel_top = channel_rect.mTop;
S32 bottom = channel_bottom + 10;
S32 top = channel_top - 10;
S32 margin = gSavedSettings.getS32("ToastGap");
//sort active toasts
......@@ -403,9 +403,9 @@ void LLNearbyChatScreenChannel::arrangeToasts()
continue;
}
S32 toast_top = bottom + toast->getRect().getHeight() + margin;
S32 toast_bottom = top - toast->getRect().getHeight() - margin;
if(toast_top > channel_rect.getHeight())
if(toast_bottom < channel_rect.mBottom)
{
while(it!=m_active_toasts.end())
{
......@@ -416,10 +416,10 @@ void LLNearbyChatScreenChannel::arrangeToasts()
}
toast_rect = toast->getRect();
toast_rect.setLeftTopAndSize(channel_rect.mLeft , bottom + toast_rect.getHeight(), toast_rect.getWidth() ,toast_rect.getHeight());
toast_rect.setOriginAndSize(channel_rect.mLeft , toast_bottom, toast_rect.getWidth() ,toast_rect.getHeight());
toast->setRect(toast_rect);
bottom += toast_rect.getHeight() - toast->getTopPad() + margin;
top -= toast_rect.getHeight() - toast->getTopPad() + margin;
}
// use reverse order to provide correct z-order and avoid toast blinking
......
......@@ -16,6 +16,7 @@
can_resize="true"
can_drag_on_left="false"
can_dock="true"
save_dock_state="true"
save_visibility="true"
single_instance="true"
>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment