diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-17 15:15:23 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-17 15:15:23 -0800 |
commit | 913eff0f675ba8938e298d24e8ef6d5c9c594acb (patch) | |
tree | c7ce6bbdfa41efc25d899a981024f6a068e2782b /indra/llui/lldockablefloater.cpp | |
parent | 889456e8924738936a9ee51a55d54d29ddd88bee (diff) | |
parent | 3b3fa1c0ab74546538a02a69098afc99eddd49f5 (diff) |
merge
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
-rw-r--r-- | indra/llui/lldockablefloater.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index c3dd4ae647..9a2f2ab4d3 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -136,21 +136,10 @@ void LLDockableFloater::setVisible(BOOL visible) void LLDockableFloater::setMinimized(BOOL minimize) { - if(minimize && isDocked()) + if(minimize) { setVisible(FALSE); } - - if (minimize) - { - setCanDock(false); - } - else if (!minimize && mDockControl.get() != NULL && mDockControl.get()->isDockVisible()) - { - setCanDock(true); - } - - LLFloater::setMinimized(minimize); } LLView * LLDockableFloater::getDockWidget() @@ -217,6 +206,16 @@ void LLDockableFloater::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) { mDockControl.reset(dockControl); |