Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed #1308: Used std::sort to sort the touchHandler array.

This commit is contained in:
James Chen 2012-06-07 11:38:59 +08:00
parent fea278b5b2
commit f466b081c9
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cocos2dx/touch_dispatcher/CCTouchDispatcher.cpp
View File

@ -38,12 +38,11 @@ NS_CC_BEGIN
/**
* Used for sort
*/
static int less(const void* p1, const void* p2)
static int less(const CCObject* p1, const CCObject* p2)
{
return (*((CCTouchHandler**)p1))->getPriority() - (*((CCTouchHandler**)p2))->getPriority();
return ((CCTouchHandler*)p1)->getPriority() < ((CCTouchHandler*)p2)->getPriority();
}
bool CCTouchDispatcher::isDispatchEvents(void)
{
return m_bDispatchEvents;
@ -293,8 +292,7 @@ CCTouchHandler* CCTouchDispatcher::findHandler(CCArray* pArray, CCTouchDelegate
void CCTouchDispatcher::rearrangeHandlers(CCArray *pArray)
{
// FIXME: qsort is not supported in bada1.0, so we must implement it ourselves.
qsort(pArray->data->arr, pArray->data->num, sizeof(pArray->data->arr[0]), less);
std::sort(pArray->data->arr, pArray->data->arr + pArray->data->num, less);
}
void CCTouchDispatcher::setPriority(int nPriority, CCTouchDelegate *pDelegate)
@ -306,11 +304,13 @@ void CCTouchDispatcher::setPriority(int nPriority, CCTouchDelegate *pDelegate)
handler = this->findHandler(pDelegate);
CCAssert(handler != NULL, "");
handler->setPriority(nPriority);
this->rearrangeHandlers(m_pTargetedHandlers);
this->rearrangeHandlers(m_pStandardHandlers);
if (handler->getPriority() != nPriority)
{
handler->setPriority(nPriority);
this->rearrangeHandlers(m_pTargetedHandlers);
this->rearrangeHandlers(m_pStandardHandlers);
}
}
//