Selaa lähdekoodia

Patch for multi-touch issue affecting Forms -- e.g. causing buttons to become stuck in the "active" state.
Containers were consuming TOUCH_RELEASE events that occurred outside themselves, even though none of their controls were affected.

Adam Blake 13 vuotta sitten
vanhempi
sitoutus
9841f97a7e
1 muutettua tiedostoa jossa 5 lisäystä ja 1 poistoa
  1. 5 1
      gameplay/src/Container.cpp

+ 5 - 1
gameplay/src/Container.cpp

@@ -1128,7 +1128,11 @@ bool Container::pointerEvent(bool mouse, char evt, int x, int y, int data)
     }
     }
 
 
     release();
     release();
-    return (_consumeInputEvents | eventConsumed);
+    if (x > _clipBounds.x && x <= _clipBounds.x + _clipBounds.width &&
+		y > _clipBounds.y && y <= _clipBounds.y + _clipBounds.height)
+    	return (_consumeInputEvents | eventConsumed);
+    else
+    	return eventConsumed;
 }
 }
 
 
 Container::Scroll Container::getScroll(const char* scroll)
 Container::Scroll Container::getScroll(const char* scroll)