Skip to content
Snippets Groups Projects
Commit c7b69713 authored by Alexei Arabadji's avatar Alexei Arabadji
Browse files

fixed EXT-3564 “Docked windows hide when clicking on sidetray tabs”,

added sidetray tab buttons panel to transient manager control list,
added right padding to the docking rect area to avoid overlapping docked IM
floaters with sidetray buttons;

--HG--
branch : product-engine
parent 3b1ead66
No related branches found
No related tags found
No related merge requests found
......@@ -56,6 +56,7 @@
#include "llvoicechannel.h"
#include "lltransientfloatermgr.h"
#include "llinventorymodel.h"
#include "llrootview.h"
......@@ -437,6 +438,16 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
void LLIMFloater::getAllowedRect(LLRect& rect)
{
rect = gViewerWindow->getWorldViewRectRaw();
static S32 right_padding = 0;
if (right_padding == 0)
{
LLPanel* side_bar_tabs =
gViewerWindow->getRootView()->getChild<LLPanel> (
"side_bar_tabs");
right_padding = side_bar_tabs->getRect().getWidth();
LLTransientFloaterMgr::getInstance()->addControlView(side_bar_tabs);
}
rect.mRight -= right_padding;
}
void LLIMFloater::setDocked(bool docked, bool pop_on_undock)
......
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