Pointer: fix objects in substates not being selectable

HaxeFlixel · Feb 28, 2017 · 69042ab · 69042ab
1 parent e08dba2
commit 69042ab
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/flixel/system/debug/interaction/Interaction.hx b/flixel/system/debug/interaction/Interaction.hx
@@ -378,7 +378,7 @@ class Interaction extends Window
 	private function restoreSystemCursor():Void
 	{
 		#if FLX_MOUSE
-		FlxG.mouse.useSystemCursor = _wasUsingSystemCursor;		
+		FlxG.mouse.useSystemCursor = _wasUsingSystemCursor;
 		FlxG.mouse.visible = _wasMouseVisible;
 		_customCursor.visible = false;
 		#end
@@ -455,6 +455,13 @@ class Interaction extends Window
 		return (_turn - value) == 1;
 	}
 
+	public function findItemsWithinState(items:Array<FlxBasic>, state:FlxState, area:FlxRect):Void
+	{
+		findItemsWithinArea(items, state.members, area);
+		if (state.subState != null)
+			findItemsWithinState(items, state.subState, area);
+	}
+
 	/**
 	 * Find all items within an area. In order to improve performance and reduce temporary allocations,
 	 * the method has no return, you must pass an array where items will be placed. The method decides

diff --git a/flixel/system/debug/interaction/tools/Pointer.hx b/flixel/system/debug/interaction/tools/Pointer.hx
@@ -134,7 +134,7 @@ class Pointer extends Tool
 		calculateSelectionArea();
 
 		if (findItems)
-			_brain.findItemsWithinArea(_itemsInSelectionArea, FlxG.state.members, _selectionArea);
+			_brain.findItemsWithinState(_itemsInSelectionArea, FlxG.state, _selectionArea);
 
 		// Clear everything
 		_selectionHappening = false;