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

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2015-11-03 01:13:18 +02:00
commit 4abb02afcd
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -569,7 +569,7 @@ namespace NLGUI
std::vector< CInterfaceGroup* > _GroupsUnderPointer; std::vector< CInterfaceGroup* > _GroupsUnderPointer;
// view that should be notified from clock msg // view that should be notified from clock msg
std::vector<CCtrlBase*> _ClockMsgTargets; std::list<CCtrlBase*> _ClockMsgTargets;
NLMISC::CRGBA _GlobalColor; NLMISC::CRGBA _GlobalColor;
NLMISC::CRGBA _GlobalColorForContent; NLMISC::CRGBA _GlobalColorForContent;

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

@ -2866,17 +2866,19 @@ namespace NLGUI
void CWidgetManager::unregisterClockMsgTarget(CCtrlBase *vb) void CWidgetManager::unregisterClockMsgTarget(CCtrlBase *vb)
{ {
if (!vb) return; if (!vb) return;
std::vector<CCtrlBase*>::iterator it = std::find(_ClockMsgTargets.begin(), _ClockMsgTargets.end(), vb); std::list<CCtrlBase*>::iterator it = std::find(_ClockMsgTargets.begin(), _ClockMsgTargets.end(), vb);
if (it != _ClockMsgTargets.end()) if (it != _ClockMsgTargets.end())
{ {
_ClockMsgTargets.erase(it); // instead of deleting, just mark as deleted incase we are inside iterating loop,
// it will be removed in sendClockTickEvent
(*it) = NULL;
} }
} }
// *************************************************************************** // ***************************************************************************
bool CWidgetManager::isClockMsgTarget(CCtrlBase *vb) const bool CWidgetManager::isClockMsgTarget(CCtrlBase *vb) const
{ {
std::vector<CCtrlBase*>::const_iterator it = std::find(_ClockMsgTargets.begin(), _ClockMsgTargets.end(), vb); std::list<CCtrlBase*>::const_iterator it = std::find(_ClockMsgTargets.begin(), _ClockMsgTargets.end(), vb);
return it != _ClockMsgTargets.end(); return it != _ClockMsgTargets.end();
} }
@ -2895,10 +2897,16 @@ namespace NLGUI
} }
// and send clock tick msg to ctrl that are registered // and send clock tick msg to ctrl that are registered
std::vector<CCtrlBase*> clockMsgTarget = _ClockMsgTargets; for(std::list<CCtrlBase*>::iterator it = _ClockMsgTargets.begin(); it != _ClockMsgTargets.end();)
for(std::vector<CCtrlBase*>::iterator it = clockMsgTarget.begin(); it != clockMsgTarget.end(); ++it)
{ {
(*it)->handleEvent(clockTick); CCtrlBase* ctrl = *it;
if (ctrl)
{
ctrl->handleEvent(clockTick);
++it;
}
else
it = _ClockMsgTargets.erase(it);
} }
} }