Hittest bounds

src/openfl/display/Bitmap.hx

@@ -90,7 +90,7 @@ class Bitmap extends DisplayObject {
 
 	}
 
-	private override function __getBounds (rect:Rectangle, matrix:Matrix):Void {
+	private override function __getOwnBounds (rect:Rectangle, matrix:Matrix):Void {
 
 		if (__bitmapData != null) {
 

src/openfl/display/DisplayObject.hx

@@ -90,6 +90,7 @@ class DisplayObject extends EventDispatcher implements IBitmapDrawable {
 	private var __children:Array<DisplayObject>;
 	private var __filters:Array<BitmapFilter>;
 	private var __graphics:Graphics;
+	private var __hitTestBounds:Rectangle;
 	private var __isMask:Bool;
 	private var __loaderInfo:LoaderInfo;
 	private var __mask:DisplayObject;
@@ -138,6 +139,7 @@ class DisplayObject extends EventDispatcher implements IBitmapDrawable {
 		__scaleX = 1;
 		__scaleY = 1;
 
+		__hitTestBounds = new Rectangle ();
 		__worldAlpha = 1;
 		__worldBlendMode = NORMAL;
 		__worldTransform = new Matrix ();
@@ -489,6 +491,13 @@ class DisplayObject extends EventDispatcher implements IBitmapDrawable {
 
 	private function __getBounds (rect:Rectangle, matrix:Matrix):Void {
 
+		__getOwnBounds (rect, matrix);
+
+	}
+
+
+	private function __getOwnBounds (rect:Rectangle, matrix:Matrix):Void {
+
 		if (__graphics != null) {
 
 			__graphics.__getBounds (rect, matrix);
@@ -498,6 +507,14 @@ class DisplayObject extends EventDispatcher implements IBitmapDrawable {
 	}
 
 
+	function __updateHitTestBounds () {
+
+		__hitTestBounds.setEmpty ();
+		__getOwnBounds (__hitTestBounds, __worldTransform);
+
+	}
+
+
 	private function __getCursor ():MouseCursor {
 
 		return null;
@@ -643,6 +660,8 @@ class DisplayObject extends EventDispatcher implements IBitmapDrawable {
 
 	private function __hitTest (x:Float, y:Float, shapeFlag:Bool, stack:Array<DisplayObject>, interactiveOnly:Bool, hitObject:DisplayObject, hitTestWhenMouseDisabled:Bool = false):Bool {
 
+		if (!__hitTestBounds.contains(x, y)) return false;
+
 		if (__graphics != null) {
 
 			if (!hitObject.visible || __isMask) return false;
@@ -1194,6 +1213,7 @@ class DisplayObject extends EventDispatcher implements IBitmapDrawable {
 
 			__calculateAbsoluteTransform (__transform, parent.__worldTransform, __worldTransform);
 			__calculateAbsoluteTransform (__transform, parent.__renderTransform, __renderTransform);
+			__updateHitTestBounds (); // TODO: scrollRect should clip this
 
 		} else {
 

src/openfl/display/DisplayObjectContainer.hx

@@ -504,6 +504,7 @@ class DisplayObjectContainer extends InteractiveObject {
 	private override function __hitTest (x:Float, y:Float, shapeFlag:Bool, stack:Array<DisplayObject>, interactiveOnly:Bool, hitObject:DisplayObject, hitTestWhenMouseDisabled:Bool = false):Bool {
 
 		if (!hitObject.visible || __isMask || (!hitTestWhenMouseDisabled && interactiveOnly && !mouseEnabled && !mouseChildren)) return false;
+		if (!__hitTestBounds.contains(x, y)) return false;
 		if (mask != null && !mask.__hitTestMask (x, y)) return false;
 
 		if (!__isPointInScrollRect (x, y)) {
@@ -866,9 +867,14 @@ class DisplayObjectContainer extends InteractiveObject {
 
 		} else if (__updateTraverse) {
 
+			__updateHitTestBounds ();
+
 			for (child in __children) {
 
 				child.__traverse ();
+
+				var childBounds = child.__hitTestBounds;
+				__hitTestBounds.__expand (childBounds.x, childBounds.y, childBounds.width, childBounds.height);
 
 			}
 
@@ -894,6 +900,9 @@ class DisplayObjectContainer extends InteractiveObject {
 
 			child.__update (resetUpdateDirty);
 
+			var childBounds = child.__hitTestBounds;
+			__hitTestBounds.__expand (childBounds.x, childBounds.y, childBounds.width, childBounds.height);
+
 		}
 
 	}

src/openfl/display/Sprite.hx

@@ -71,6 +71,7 @@ class Sprite extends DisplayObjectContainer {
 	private override function __hitTest (x:Float, y:Float, shapeFlag:Bool, stack:Array<DisplayObject>, interactiveOnly:Bool, hitObject:DisplayObject, hitTestWhenMouseDisabled:Bool = false):Bool {
 
 		if (!hitObject.visible || __isMask) return false;
+		if (!__hitTestBounds.contains(x, y)) return false;
 
 		if (interactiveOnly && !mouseEnabled && !mouseChildren) { 
 

src/openfl/text/TextField.hx

@@ -977,7 +977,7 @@ class TextField extends InteractiveObject {
 	}
 
 
-	private override function __getBounds (rect:Rectangle, matrix:Matrix):Void {
+	private override function __getOwnBounds (rect:Rectangle, matrix:Matrix):Void {
 
 		__updateLayout ();