Skip to content
Snippets Groups Projects
Commit 78850a22 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix deep find widget recursion when script button popup is being shown

parent 8b474f70
No related branches found
No related tags found
No related merge requests found
...@@ -74,6 +74,8 @@ LLDockControl::LLDockControl(LLView* dockWidget, LLFloater* dockableFloater, ...@@ -74,6 +74,8 @@ LLDockControl::LLDockControl(LLView* dockWidget, LLFloater* dockableFloater,
{ {
mDockWidgetVisible = false; mDockWidgetVisible = false;
} }
mNonToolbarPanelHandle = dockableFloater->getRootView()->getChild<LLView>("non_toolbar_panel")->getHandle();
} }
LLDockControl::~LLDockControl() LLDockControl::~LLDockControl()
...@@ -97,7 +99,10 @@ void LLDockControl::setDock(LLView* dockWidget) ...@@ -97,7 +99,10 @@ void LLDockControl::setDock(LLView* dockWidget)
void LLDockControl::getAllowedRect(LLRect& rect) void LLDockControl::getAllowedRect(LLRect& rect)
{ {
rect = mDockableFloater->getRootView()->getChild<LLView>("non_toolbar_panel")->getRect(); if (!mNonToolbarPanelHandle.isDead())
{
rect = mNonToolbarPanelHandle.get()->getRect();
}
} }
void LLDockControl::repositionDockable() void LLDockControl::repositionDockable()
......
...@@ -84,6 +84,7 @@ class LLDockControl ...@@ -84,6 +84,7 @@ class LLDockControl
bool mDockWidgetVisible; bool mDockWidgetVisible;
DocAt mDockAt; DocAt mDockAt;
LLHandle<LLView> mDockWidgetHandle; LLHandle<LLView> mDockWidgetHandle;
LLHandle<LLView> mNonToolbarPanelHandle;
LLRect mPrevDockRect; LLRect mPrevDockRect;
LLRect mRootRect; LLRect mRootRect;
LLRect mFloaterRect; LLRect mFloaterRect;
......
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