Skip to content
Snippets Groups Projects
Commit 7453aae1 authored by Dmitry Zaporozhan's avatar Dmitry Zaporozhan
Browse files

Fixed normal bug EXT-4862 - Nearby Chat pop-up toasts close affordance displays under prior toasts.

Implemented same fix for notification toasts.

--HG--
branch : product-engine
parent 8693cf51
No related branches found
No related tags found
No related merge requests found
...@@ -274,6 +274,13 @@ void LLNearbyChatScreenChannel::showToastsBottom() ...@@ -274,6 +274,13 @@ void LLNearbyChatScreenChannel::showToastsBottom()
toast->setRect(toast_rect); toast->setRect(toast_rect);
toast->setIsHidden(false); toast->setIsHidden(false);
toast->setVisible(TRUE); toast->setVisible(TRUE);
if(!toast->hasFocus())
{
// Fixing Z-order of toasts (EXT-4862)
// Next toast will be positioned under this one.
gFloaterView->sendChildToBack(toast);
}
bottom = toast->getRect().mTop; bottom = toast->getRect().mTop;
} }
......
...@@ -533,9 +533,13 @@ void LLScreenChannel::showToastsBottom() ...@@ -533,9 +533,13 @@ void LLScreenChannel::showToastsBottom()
// HACK // HACK
// EXT-2653: it is necessary to prevent overlapping for secondary showed toasts // EXT-2653: it is necessary to prevent overlapping for secondary showed toasts
(*it).toast->setVisible(TRUE); (*it).toast->setVisible(TRUE);
// Show toast behind floaters. (EXT-3089)
gFloaterView->sendChildToBack((*it).toast);
} }
if(!(*it).toast->hasFocus())
{
// Fixing Z-order of toasts (EXT-4862)
// Next toast will be positioned under this one.
gFloaterView->sendChildToBack((*it).toast);
}
} }
if(it != mToastList.rend()) if(it != mToastList.rend())
......
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