From 2c553e8873186465296323d8fea1b783c90bfc45 Mon Sep 17 00:00:00 2001 From: George Kurelic Date: Sun, 12 Jan 2025 14:32:52 -0600 Subject: [PATCH 1/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 98b569c..c5063d4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![](https://raw.github.com/HaxeFlixel/haxeflixel.com/master/src/files/images/flixel-logos/flixel-ui.png) +![](https://github.com/HaxeFlixel/haxeflixel.com/blob/dev/content/_static/images/flixel-logos/flixel-ui.png?raw=true) [flixel](https://github.com/HaxeFlixel/flixel) | [addons](https://github.com/HaxeFlixel/flixel-addons) | [ui](https://github.com/HaxeFlixel/flixel-ui) | [demos](https://github.com/HaxeFlixel/flixel-demos) | [tools](https://github.com/HaxeFlixel/flixel-tools) | [templates](https://github.com/HaxeFlixel/flixel-templates) | [docs](https://github.com/HaxeFlixel/flixel-docs) | [haxeflixel.com](https://github.com/HaxeFlixel/haxeflixel.com) From 11c9ed5129219bf0f7e170465a143bdc53de0f3f Mon Sep 17 00:00:00 2001 From: George Kurelic Date: Thu, 23 Jan 2025 11:05:26 -0600 Subject: [PATCH 2/2] Remove refs to statusAnimations for flixel > 5.9 (#291) * remove refs to statusAnimations for flixel > 5.9 * D'oh * fix version checks --- flixel/addons/ui/FlxInputText.hx | 2 +- flixel/addons/ui/FlxUIGroup.hx | 4 ++-- flixel/addons/ui/FlxUITypedButton.hx | 36 +++++++++++++++++----------- flixel/addons/ui/FontDef.hx | 2 +- flixel/addons/ui/FontFixer.hx | 2 +- flixel/addons/ui/U.hx | 2 +- 6 files changed, 28 insertions(+), 20 deletions(-) diff --git a/flixel/addons/ui/FlxInputText.hx b/flixel/addons/ui/FlxInputText.hx index 6f100a7..fe32b54 100644 --- a/flixel/addons/ui/FlxInputText.hx +++ b/flixel/addons/ui/FlxInputText.hx @@ -745,7 +745,7 @@ class FlxInputText extends FlxText r.x = r.y = 0; caret.pixels.fillRect(r, caretC); // draw caret caret.offset.x = caret.offset.y = 0; - #if (flixel > "5.8.0") + #if (flixel > version("5.8.0")) case SHADOW_XY(shadowX, shadowY): // Shadow offset to the lower-right cw += Std.int(Math.abs(shadowX)); diff --git a/flixel/addons/ui/FlxUIGroup.hx b/flixel/addons/ui/FlxUIGroup.hx index 96c6ce2..155aaa9 100644 --- a/flixel/addons/ui/FlxUIGroup.hx +++ b/flixel/addons/ui/FlxUIGroup.hx @@ -4,11 +4,11 @@ import flixel.FlxSprite; import flixel.group.FlxSpriteGroup; import flixel.math.FlxRect; import flixel.addons.ui.interfaces.IFlxUIWidget; -#if (flixel >= "5.7.0") +#if (flixel >= version("5.7.0")) import flixel.group.FlxSpriteContainer; #end -#if (flixel < "5.4.0" && FLX_NO_POINT_POOL) +#if (flixel < version("5.4.0") && FLX_NO_POINT_POOL) /* This is a weird haxe bug I haven't figured out, fixed in 5.4.0 * via https://github.com/HaxeFlixel/flixel/pull/2808 * Note: this is only the case when FLX_NO_POINT_POOL is defined. diff --git a/flixel/addons/ui/FlxUITypedButton.hx b/flixel/addons/ui/FlxUITypedButton.hx index 5f3e5c1..ab0255c 100644 --- a/flixel/addons/ui/FlxUITypedButton.hx +++ b/flixel/addons/ui/FlxUITypedButton.hx @@ -170,28 +170,39 @@ class FlxUITypedButton extends FlxTypedButton implements IFlxUIB _centerLabelOffset = FlxPoint.get(0, 0); - statusAnimations[3] = "normal_toggled"; - statusAnimations[4] = "highlight_toggled"; - statusAnimations[5] = "pressed_toggled"; - labelAlphas = [for (i in 0...3) 1]; inputOver = new FlxInput(0); } - + override public function graphicLoaded():Void { super.graphicLoaded(); - - setupAnimation("normal_toggled", 3); - setupAnimation("highlight_toggled", 4); - setupAnimation("pressed_toggled", 5); + + setupAnimation(getToggleStatusAnimation(NORMAL), 3); + setupAnimation(getToggleStatusAnimation(HIGHLIGHT), #if FLX_MOUSE 4 #else 3 #end); + setupAnimation(getToggleStatusAnimation(PRESSED), 5); if (_autoCleanup) { cleanup(); } } + + function getToggleStatusAnimation(status:FlxButtonState) + { + #if (flixel <= "5.9.0") + return switch(status) + { + case NORMAL: "normal_toggled"; + case PRESSED: "pressed_toggled"; + case HIGHLIGHT: "highlight_toggled"; + case DISABLED: "disabled_toggled"; + } + #else + return status.toString() + "_toggled"; + #end + } @:access(flixel.addons.ui.FlxUITypedButton) public function copyGraphic(other:FlxUITypedButton):Void @@ -311,14 +322,11 @@ class FlxUITypedButton extends FlxTypedButton implements IFlxUIB } } - /** - * Offset the statusAnimations-index by 3 when toggled. - */ - override public function updateStatusAnimation():Void + override function updateStatusAnimation():Void { if (has_toggle && toggled) { - animation.play(statusAnimations[status + 3]); + animation.play(getToggleStatusAnimation(status)); } else { diff --git a/flixel/addons/ui/FontDef.hx b/flixel/addons/ui/FontDef.hx index 276f75c..696ee57 100644 --- a/flixel/addons/ui/FontDef.hx +++ b/flixel/addons/ui/FontDef.hx @@ -7,7 +7,7 @@ import flixel.text.FlxText; import flixel.util.FlxColor; import openfl.Assets; import openfl.text.TextFormatAlign; -#if (openfl >= "4.0.0") +#if (openfl >= version("4.0.0")) import openfl.utils.AssetType; #end diff --git a/flixel/addons/ui/FontFixer.hx b/flixel/addons/ui/FontFixer.hx index ab9a53c..b9e0ea8 100644 --- a/flixel/addons/ui/FontFixer.hx +++ b/flixel/addons/ui/FontFixer.hx @@ -1,7 +1,7 @@ package flixel.addons.ui; import openfl.Assets; -#if (openfl >= "4.0.0") +#if (openfl >= version("4.0.0")) import openfl.utils.AssetType; #end diff --git a/flixel/addons/ui/U.hx b/flixel/addons/ui/U.hx index a21753a..479f49d 100644 --- a/flixel/addons/ui/U.hx +++ b/flixel/addons/ui/U.hx @@ -27,7 +27,7 @@ import sys.FileSystem; import sys.io.File; import sys.io.FileOutput; #end -#if (openfl >= "4.0.0") +#if (openfl >= version("4.0.0")) import openfl.utils.AssetType; #end #if haxe4