Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Select groups first.

Browse source
This commit is contained in:
dfighter1985 2014-10-08 17:37:05 +02:00
parent 7504dc1238
commit 4d06c3c278
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2400,21 +2400,34 @@ namespace NLGUI
// 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())
{ {
for( sint32 i = _GroupsUnderPointer.size() - 1; i >= 0; i-- )
// 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]; CInterfaceGroup *g = _GroupsUnderPointer[ i ];
if (ctrl && ctrl->isCapturable() && ctrl->isInGroup( pNewCurrentWnd ) ) if( ( g != NULL ) && ( g->isInGroup( pNewCurrentWnd ) ) )
{ {
uint d = ctrl->getDepth( pNewCurrentWnd ); _CapturedView = g;
if (d > nMaxDepth) captured = true;
break;
}
}
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 ) )
{ {
nMaxDepth = d; uint d = ctrl->getDepth( pNewCurrentWnd );
setCapturePointerLeft( ctrl ); if (d > nMaxDepth)
captured = true; {
nMaxDepth = d;
setCapturePointerLeft( ctrl );
captured = true;
}
} }
} }
} }