diff options
author | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-19 18:41:41 +0200 |
---|---|---|
committer | Alexei Arabadji <aarabadji@productengine.com> | 2009-11-19 18:41:41 +0200 |
commit | 910f25a32ce1d287788b0c184a530c2c450391fa (patch) | |
tree | 6f5eab133c85bedc7c04d0dc99ce3cd8a59a511a /indra | |
parent | 8cd7a2b5f4595c4d824a25147a15ab72aa66a920 (diff) |
fixed EXT-2515 "Docked floaters should be resizeable"
undock floater when user resize floater by resize bar;
--HG--
branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r-- | indra/llui/llresizebar.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llresizebar.cpp b/indra/llui/llresizebar.cpp index 304ac64f31..a7cf9be277 100644 --- a/indra/llui/llresizebar.cpp +++ b/indra/llui/llresizebar.cpp @@ -143,6 +143,12 @@ BOOL LLResizeBar::handleHover(S32 x, S32 y, MASK mask) if( valid_rect.localPointInRect( screen_x, screen_y ) && mResizingView ) { + // undock floater when user resize it + if (((LLFloater*)getParent())->isDocked()) + { + ((LLFloater*)getParent())->setDocked(false, false); + } + // Resize the parent LLRect orig_rect = mResizingView->getRect(); LLRect scaled_rect = orig_rect; |