aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-23 15:26:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Orphaned widgets won't get stuck.

Browse source
This commit is contained in:
dfighter1985 2014-09-24 20:40:37 +02:00
parent 7907ee8cdb
commit 35017fe059
1 changed files with 43 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
code/nel/src/gui/widget_manager.cpp
View file

@ -2409,6 +2409,30 @@ namespace NLGUI
// must not capture a new element if a sheet is currentlty being dragged. // 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 // This may happen when alt-tab has been used => the sheet is dragged but the left button is up
if (!CCtrlDraggable::getDraggedSheet()) 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. // Take the top most control.
uint nMaxDepth = 0; uint nMaxDepth = 0;
@ -2427,6 +2451,7 @@ namespace NLGUI
} }
} }
} }
}
if( CInterfaceElement::getEditorMode() && !captured ) if( CInterfaceElement::getEditorMode() && !captured )
{ {
@ -2674,23 +2699,22 @@ namespace NLGUI
if( draggedElement != NULL ) if( draggedElement != NULL )
{ {
CInterfaceGroup *g = getGroupUnder( draggedElement->getXReal(), draggedElement->getYReal() ); CInterfaceGroup *g = getGroupUnder( draggedElement->getXReal(), draggedElement->getYReal() );
if( g != NULL )
{
CInterfaceElement *e = draggedElement; CInterfaceElement *e = draggedElement;
e->setName( "=MARKED=" );
e->setParent( g ); e->setParent( g );
e->setIdRecurse( e->getShortId() ); e->setIdRecurse( e->getShortId() );
g->addElement( e );
e->setParentPos( g ); e->setParentPos( g );
e->setParentSize( g ); e->setParentSize( g );
checkCoords(); if( g != NULL )
{
g->addElement( e );
} }
else else
_OrphanElements.push_back( draggedElement ); _OrphanElements.push_back( draggedElement );
checkCoords();
draggedElement = NULL; draggedElement = NULL;
} }
} }