diff options
| author | James Cook <james@lindenlab.com> | 2009-07-27 17:56:26 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-27 17:56:26 +0000 |
| commit | 8f7ec64899c54dcee6caa0307510cc4003ba7bdd (patch) | |
| tree | 513093c8550e0baf567d10168b9f750ba869fc21 /indra/llui/lldraghandle.cpp | |
| parent | ca51e8f33dfa0cd455438f11902fb1d839bf6206 (diff) | |
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/llui/lldraghandle.cpp')
| -rw-r--r-- | indra/llui/lldraghandle.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp index 8ecbdb98e1..6e8e37ded3 100644 --- a/indra/llui/lldraghandle.cpp +++ b/indra/llui/lldraghandle.cpp @@ -317,6 +317,23 @@ BOOL LLDragHandle::handleHover(S32 x, S32 y, MASK mask) S32 delta_x = screen_x - mDragLastScreenX; S32 delta_y = screen_y - mDragLastScreenY; + // if dragging a docked floater we want to undock + if (((LLFloater*)getParent())->isDocked()) + { + const S32 SLOP = 12; + + if (delta_y <= -SLOP || + delta_y >= SLOP) + { + ((LLFloater*)getParent())->setDocked(false, false); + return TRUE; + } + else + { + return FALSE; + } + } + LLRect original_rect = getParent()->getRect(); LLRect translated_rect = getParent()->getRect(); translated_rect.translate(delta_x, delta_y); |