Orphaned widgets won't get stuck.

--HG--
branch : dfighter-tools

code/nel/src/gui/widget_manager.cpp

@@ -2409,6 +2409,30 @@ namespace NLGUI
 				// must not capture a new element if a sheet is currentlty being dragged.
 				// This may happen when alt-tab has been used => the sheet is dragged but the left button is up
 				if (!CCtrlDraggable::getDraggedSheet())
+				{
+
+					if( CInterfaceElement::getEditorMode() )
+					{
+						std::vector< NLMISC::CRefPtr< CInterfaceElement > >::reverse_iterator itr = _OrphanElements.rbegin();
+						while( itr != _OrphanElements.rend() )
+						{
+							CInterfaceElement *e = *itr;
+
+							int x = getPointer()->getXReal();
+							int y = getPointer()->getYReal();
+
+							if( e->isIn( x, y ) )
+							{
+								_CapturedView = static_cast< CViewBase* >( e );
+								captured = true;
+								break;
+							}
+
+							++itr;
+						}
+					}
+
+					if( !captured )
 					{
 						// Take the top most control.
 						uint nMaxDepth = 0;
@@ -2427,6 +2451,7 @@ namespace NLGUI
 								}
 							}
 						}
+					}
 
 					if( CInterfaceElement::getEditorMode() && !captured )
 					{
@@ -2674,23 +2699,22 @@ namespace NLGUI
 		if( draggedElement != NULL )
 		{
 			CInterfaceGroup *g = getGroupUnder( draggedElement->getXReal(), draggedElement->getYReal() );
-
-			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();
+			if( g != NULL )
+			{
+				g->addElement( e );
 			}
 			else
 				_OrphanElements.push_back( draggedElement );
 
+			checkCoords();
+
 			draggedElement = NULL;
 		}
 	}