From c5b8f30bb93ae675fde6968176097a7242c36227 Mon Sep 17 00:00:00 2001
From: dfighter1985 <devnull@localhost>
Date: Wed, 24 Sep 2014 20:40:37 +0200
Subject: [PATCH] Orphaned widgets won't get stuck.

---
 code/nel/src/gui/widget_manager.cpp | 62 ++++++++++++++++++++---------
 1 file changed, 43 insertions(+), 19 deletions(-)

diff --git a/code/nel/src/gui/widget_manager.cpp b/code/nel/src/gui/widget_manager.cpp
index e44fa4d15..771bcf50e 100644
--- a/code/nel/src/gui/widget_manager.cpp
+++ b/code/nel/src/gui/widget_manager.cpp
@@ -2410,20 +2410,45 @@ namespace NLGUI
 				// This may happen when alt-tab has been used => the sheet is dragged but the left button is up
 				if (!CCtrlDraggable::getDraggedSheet())
 				{
-					// Take the top most control.
-					uint nMaxDepth = 0;
-					const std::vector< CCtrlBase* >& _CtrlsUnderPointer = getCtrlsUnderPointer();
-					for (sint32 i = (sint32)_CtrlsUnderPointer.size()-1; i >= 0; i--)
+
+					if( CInterfaceElement::getEditorMode() )
 					{
-						CCtrlBase	*ctrl= _CtrlsUnderPointer[i];
-						if (ctrl && ctrl->isCapturable() && ctrl->isInGroup( pNewCurrentWnd ) )
+						std::vector< NLMISC::CRefPtr< CInterfaceElement > >::reverse_iterator itr = _OrphanElements.rbegin();
+						while( itr != _OrphanElements.rend() )
 						{
-							uint d = ctrl->getDepth( pNewCurrentWnd );
-							if (d > nMaxDepth)
+							CInterfaceElement *e = *itr;
+
+							int x = getPointer()->getXReal();
+							int y = getPointer()->getYReal();
+
+							if( e->isIn( x, y ) )
 							{
-								nMaxDepth = d;
-								setCapturePointerLeft( ctrl );
+								_CapturedView = static_cast< CViewBase* >( e );
 								captured = true;
+								break;
+							}
+
+							++itr;
+						}
+					}
+
+					if( !captured )
+					{
+						// Take the top most control.
+						uint nMaxDepth = 0;
+						const std::vector< CCtrlBase* >& _CtrlsUnderPointer = getCtrlsUnderPointer();
+						for (sint32 i = (sint32)_CtrlsUnderPointer.size()-1; i >= 0; i--)
+						{
+							CCtrlBase	*ctrl= _CtrlsUnderPointer[i];
+							if (ctrl && ctrl->isCapturable() && ctrl->isInGroup( pNewCurrentWnd ) )
+							{
+								uint d = ctrl->getDepth( pNewCurrentWnd );
+								if (d > nMaxDepth)
+								{
+									nMaxDepth = d;
+									setCapturePointerLeft( ctrl );
+									captured = true;
+								}
 							}
 						}
 					}
@@ -2674,23 +2699,22 @@ namespace NLGUI
 		if( draggedElement != NULL )
 		{
 			CInterfaceGroup *g = getGroupUnder( draggedElement->getXReal(), draggedElement->getYReal() );
+			CInterfaceElement *e = draggedElement;
+			
+			e->setParent( g );
+			e->setIdRecurse( e->getShortId() );
+			e->setParentPos( g );
+			e->setParentSize( g );
 
 			if( g != NULL )
 			{
-				CInterfaceElement *e = draggedElement;
-				e->setName( "=MARKED=" );
-				e->setParent( g );
-				e->setIdRecurse( e->getShortId() );
 				g->addElement( e );
-
-				e->setParentPos( g );
-				e->setParentSize( g );
-
-				checkCoords();
 			}
 			else
 				_OrphanElements.push_back( draggedElement );
 
+			checkCoords();
+
 			draggedElement = NULL;
 		}
 	}