|
|
@@ -41,7 +41,7 @@ static bool sortControlsByZOrder(Control* c1, Control* c2);
|
|
|
|
|
|
void Container::clearContacts()
|
|
|
{
|
|
|
- for (int i = 0; i < 10; ++i)
|
|
|
+ for (int i = 0; i < MAX_CONTACT_INDICES; ++i)
|
|
|
_contactIndices[i] = false;
|
|
|
}
|
|
|
|
|
|
@@ -1644,7 +1644,7 @@ bool Container::mouseEventScroll(Mouse::MouseEvent evt, int x, int y, int wheelD
|
|
|
|
|
|
bool Container::inContact()
|
|
|
{
|
|
|
- for (int i = 0; i < 10; ++i)
|
|
|
+ for (int i = 0; i < MAX_CONTACT_INDICES; ++i)
|
|
|
{
|
|
|
if (_contactIndices[i])
|
|
|
return true;
|
|
|
@@ -1743,7 +1743,6 @@ bool Container::pointerEvent(bool mouse, char evt, int x, int y, int data)
|
|
|
release();
|
|
|
return false;
|
|
|
}
|
|
|
- //_contactIndices++;
|
|
|
if (!mouse)
|
|
|
_contactIndices[data] = true;
|
|
|
break;
|