From dc86f98a107246cb45454e9d472b8c6455a1335d Mon Sep 17 00:00:00 2001 From: George FunBook Date: Wed, 8 Mar 2023 11:56:13 -0600 Subject: [PATCH 1/3] add x, y and text args to FlxBitmapText --- flixel/text/FlxBitmapText.hx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/flixel/text/FlxBitmapText.hx b/flixel/text/FlxBitmapText.hx index 54dd08e4a9..fc9dd34ecd 100644 --- a/flixel/text/FlxBitmapText.hx +++ b/flixel/text/FlxBitmapText.hx @@ -199,11 +199,14 @@ class FlxBitmapText extends FlxSprite * Warning: The default font may work incorrectly on HTML5 * and is utterly unreliable on Brave Browser with shields up. * - * @param font Optional parameter for component's font prop + * @param x The initial X position of the text. + * @param y The initial Y position of the text. + * @param text The text to display. + * @param font Optional parameter for component's font prop */ - public function new(?font:FlxBitmapFont) + public function new(?x = 0.0, ?y = 0.0, ?text:String, ?font:FlxBitmapFont) { - super(); + super(x, y); width = fieldWidth = 2; alpha = 1; @@ -223,6 +226,8 @@ class FlxBitmapText extends FlxSprite textDrawData = []; borderDrawData = []; } + + this.text = text; } /** From af0a034fe1759b795b5cd114586bebe4be8add50 Mon Sep 17 00:00:00 2001 From: George FunBook Date: Wed, 8 Mar 2023 11:57:35 -0600 Subject: [PATCH 2/3] add test --- .../unit/src/flixel/text/FlxBitmapTextTest.hx | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/unit/src/flixel/text/FlxBitmapTextTest.hx b/tests/unit/src/flixel/text/FlxBitmapTextTest.hx index e66369d4c1..260eff2ff9 100644 --- a/tests/unit/src/flixel/text/FlxBitmapTextTest.hx +++ b/tests/unit/src/flixel/text/FlxBitmapTextTest.hx @@ -1,5 +1,8 @@ package flixel.text; +import flixel.text.FlxBitmapText; +import flixel.graphics.frames.FlxBitmapFont; + class FlxBitmapTextTest extends FlxTest { var text:FlxBitmapText; @@ -10,4 +13,19 @@ class FlxBitmapTextTest extends FlxTest text = new FlxBitmapText(); destroyable = text; } + + @Test // #1526 and #2750 + function testCreateSpriteSkipPosition() + { + final text1 = new FlxBitmapText("test"); + final text2 = new FlxBitmapText(FlxBitmapFont.getDefaultFont()); + + Assert.areEqual(0, text1.x); + Assert.areEqual(0, text1.y); + Assert.areEqual(0, text2.x); + Assert.areEqual(0, text2.y); + + Assert.isNotNull(text1.text); + Assert.areEqual(text1.font, text2.font); + } } From 2136bcc0fef9f9a8c24495e6975e8ad5ebf7dd09 Mon Sep 17 00:00:00 2001 From: George FunBook Date: Wed, 8 Mar 2023 12:19:24 -0600 Subject: [PATCH 3/3] fix unit test error --- tests/unit/src/flixel/text/FlxBitmapTextTest.hx | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/src/flixel/text/FlxBitmapTextTest.hx b/tests/unit/src/flixel/text/FlxBitmapTextTest.hx index 260eff2ff9..b5a2d9abbc 100644 --- a/tests/unit/src/flixel/text/FlxBitmapTextTest.hx +++ b/tests/unit/src/flixel/text/FlxBitmapTextTest.hx @@ -2,6 +2,7 @@ package flixel.text; import flixel.text.FlxBitmapText; import flixel.graphics.frames.FlxBitmapFont; +import massive.munit.Assert; class FlxBitmapTextTest extends FlxTest {