diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-22 20:14:51 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-12-22 20:14:51 +0200 |
| commit | c7b69713b794b9c326a79aad6cdee542c57ada4d (patch) | |
| tree | 1ed9eb6f98a4730db6490e2c29344157a0c4c21d | |
| parent | 3b1ead667ce0d23532426320525024a136967fc2 (diff) | |
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
| -rw-r--r-- | indra/newview/llimfloater.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index acaa6076f8..d511e6cd64 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -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) |