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

related to EXT-2515 "Docked floaters should be resizeable"

avoid undock floater when resize initiated not by user

--HG--
branch : product-engine
parent c76ab6c4
No related branches found
No related tags found
No related merge requests found
...@@ -206,16 +206,6 @@ void LLDockableFloater::draw() ...@@ -206,16 +206,6 @@ void LLDockableFloater::draw()
LLFloater::draw(); LLFloater::draw();
} }
void LLDockableFloater::reshape(S32 width, S32 height, BOOL called_from_parent)
{
if (isDocked())
{
setDocked(false);
}
LLFloater::reshape(width, height, called_from_parent);
}
void LLDockableFloater::setDockControl(LLDockControl* dockControl) void LLDockableFloater::setDockControl(LLDockControl* dockControl)
{ {
mDockControl.reset(dockControl); mDockControl.reset(dockControl);
......
...@@ -65,7 +65,6 @@ class LLDockableFloater : public LLFloater ...@@ -65,7 +65,6 @@ class LLDockableFloater : public LLFloater
/* virtula */BOOL postBuild(); /* virtula */BOOL postBuild();
/* virtual */void setDocked(bool docked, bool pop_on_undock = true); /* virtual */void setDocked(bool docked, bool pop_on_undock = true);
/* virtual */void draw(); /* virtual */void draw();
/* virtual */void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
/** /**
* If descendant class overrides setVisible() then it must still invoke its * If descendant class overrides setVisible() then it must still invoke its
......
...@@ -135,6 +135,12 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask) ...@@ -135,6 +135,12 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask)
LLView* resizing_view = getParent(); LLView* resizing_view = getParent();
if( resizing_view ) if( resizing_view )
{ {
// undock floater when user resize it
if (((LLFloater*)getParent())->isDocked())
{
((LLFloater*)getParent())->setDocked(false, false);
}
// Resize the parent // Resize the parent
LLRect orig_rect = resizing_view->getRect(); LLRect orig_rect = resizing_view->getRect();
LLRect scaled_rect = orig_rect; LLRect scaled_rect = orig_rect;
......
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