FlxSubState: add openCallback (#2023)

HaxeFlixel · Jan 11, 2017 · 18132ec · 18132ec
1 parent 83f6146
commit 18132ec
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/flixel/FlxState.hx b/flixel/FlxState.hx
@@ -119,6 +119,8 @@ class FlxState extends FlxGroup
 				subState._created = true;
 				subState.create();
 			}
+			if (subState.openCallback != null)
+				subState.openCallback();
 		}
 	}
 

diff --git a/flixel/FlxSubState.hx b/flixel/FlxSubState.hx
@@ -15,6 +15,11 @@ class FlxSubState extends FlxState
 	 */
 	public var closeCallback:Void->Void;
 
+	/**
+	 * Callback method for state open/resume event.
+	 */
+	public var openCallback:Void->Void;
+
 	/**
 	 * Helper sprite object for non-flash targets. Draws the background.
 	 */
@@ -42,6 +47,7 @@ class FlxSubState extends FlxState
 	{
 		super();
 		closeCallback = null;
+		openCallback = null;
 
 		if (FlxG.renderTile)
 			_bgSprite = new FlxBGSprite();
@@ -71,6 +77,7 @@ class FlxSubState extends FlxState
 	{
 		super.destroy();
 		closeCallback = null;
+		openCallback = null;
 		_parentState = null;
 		_bgSprite = null;
 	}

diff --git a/tests/unit/src/flixel/FlxSubStateTest.hx b/tests/unit/src/flixel/FlxSubStateTest.hx
@@ -64,4 +64,26 @@ class FlxSubStateTest extends FlxTest
 		step();
 		Assert.isNull(state2.subState);
 	}
+
+	@Test // #2023
+	function testCallbacks()
+	{
+		var opened = false;
+		var closed = false;
+
+		subState1.openCallback = function() opened = true;
+		subState1.closeCallback = function() closed = true;
+
+		FlxG.state.openSubState(subState1);
+		step();
+
+		Assert.isTrue(opened);
+		Assert.isFalse(closed);
+
+		FlxG.state.closeSubState();
+		step();
+
+		Assert.isTrue(opened);
+		Assert.isTrue(closed);
+	}
 }