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

Dragged elements will no longer disappear.

Browse source
This commit is contained in:
dfighter1985 2014-09-24 16:20:25 +02:00
parent 17dcb2acf9
commit 574d24e5e3
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/nel/include/nel/gui/widget_manager.h
View file

@ -532,7 +532,8 @@ namespace NLGUI
NLMISC::CRefPtr< CViewBase > _CapturedView; NLMISC::CRefPtr< CViewBase > _CapturedView;
NLMISC::CRefPtr< CInterfaceElement > draggedElement; NLMISC::CRefPtr< CInterfaceElement > draggedElement; // the element that we're currently dragging
std::vector< NLMISC::CRefPtr< CInterfaceElement > > _OrphanElements; // elements that were dragged out of their parents
bool startDragging(); bool startDragging();
void stopDragging(); void stopDragging();

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

@ -1037,6 +1037,8 @@ namespace NLGUI
setCapturePointerRight(NULL); setCapturePointerRight(NULL);
_CapturedView = NULL; _CapturedView = NULL;
_OrphanElements.clear();
resetColorProps(); resetColorProps();
resetAlphaRolloverSpeedProps(); resetAlphaRolloverSpeedProps();
resetGlobalAlphasProps(); resetGlobalAlphasProps();
@ -2039,6 +2041,15 @@ namespace NLGUI
} }
} }
std::vector< NLMISC::CRefPtr< CInterfaceElement > >::iterator oeitr = _OrphanElements.begin();
while( oeitr != _OrphanElements.end() )
{
CInterfaceElement *e = *oeitr;
CViewBase *v = dynamic_cast< CViewBase* >( e );
v->draw();
++oeitr;
}
if( draggedElement != NULL ) if( draggedElement != NULL )
{ {
CInterfaceElement *e = draggedElement; CInterfaceElement *e = draggedElement;
@ -2657,8 +2668,12 @@ namespace NLGUI
void CWidgetManager::stopDragging() void CWidgetManager::stopDragging()
{ {
if( draggedElement != NULL )
{
_OrphanElements.push_back( draggedElement );
draggedElement = NULL; draggedElement = NULL;
} }
}
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
void CWidgetManager::movePointer (sint32 dx, sint32 dy) void CWidgetManager::movePointer (sint32 dx, sint32 dy)
@ -3454,6 +3469,8 @@ namespace NLGUI
CWidgetManager::~CWidgetManager() CWidgetManager::~CWidgetManager()
{ {
_OrphanElements.clear();
for (uint32 i = 0; i < _MasterGroups.size(); ++i) for (uint32 i = 0; i < _MasterGroups.size(); ++i)
{ {
delete _MasterGroups[i].Group; delete _MasterGroups[i].Group;