avoid deprecated fields

HaxeFlixel · Mar 9, 2024 · 8f2a269 · 8f2a269
1 parent 569116c
commit 8f2a269
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/flixel/addons/ui/FlxInputText.hx b/flixel/addons/ui/FlxInputText.hx
@@ -1,8 +1,5 @@
 package flixel.addons.ui;
 
-import openfl.errors.Error;
-import openfl.events.KeyboardEvent;
-import openfl.geom.Rectangle;
 import flixel.FlxG;
 import flixel.FlxSprite;
 import flixel.addons.ui.FlxUI.NamedString;
@@ -14,6 +11,9 @@ import flixel.util.FlxColor;
 import flixel.util.FlxDestroyUtil;
 import flixel.util.FlxTimer;
 import lime.system.Clipboard;
+import openfl.errors.Error;
+import openfl.events.KeyboardEvent;
+import openfl.geom.Rectangle;
 
 /**
  * FlxInputText v1.11, ported to Haxe
@@ -299,7 +299,7 @@ class FlxInputText extends FlxText
 		if (Sprite != null && Sprite.visible)
 		{
 			Sprite.scrollFactor = scrollFactor;
-			Sprite.cameras = cameras;
+			Sprite._cameras = _cameras;
 			Sprite.draw();
 		}
 	}

diff --git a/flixel/addons/ui/FlxUIGroup.hx b/flixel/addons/ui/FlxUIGroup.hx
@@ -19,7 +19,9 @@ typedef FlxUIGroup = FlxTypedUIGroup<FlxSprite>;
  * without having to call reset()
  * @author Lars Doucet
  */
-class FlxTypedUIGroup<T:FlxSprite> extends FlxTypedSpriteGroup<T> implements IFlxUIWidget
+class FlxTypedUIGroup<T:FlxSprite>
+	extends #if(flixel >= "5.7.0") FlxTypedSpriteGroup<T> #else FlxTypedSpriteContainer<T> #end
+	implements IFlxUIWidget
 {
 	/** a handy string handler name for this thing */
 	public var name:String;

diff --git a/flixel/addons/ui/FlxUITooltip.hx b/flixel/addons/ui/FlxUITooltip.hx
@@ -1,16 +1,16 @@
 package flixel.addons.ui;
 
-import flixel.addons.ui.FlxUITooltip.FlxUITooltipStyle;
 import flixel.FlxObject;
-import flixel.text.FlxText;
-import flixel.text.FlxText.FlxTextBorderStyle;
 import flixel.FlxSprite;
+import flixel.addons.ui.FlxUITooltip.FlxUITooltipStyle;
 import flixel.math.FlxPoint;
 import flixel.system.FlxAssets.FlxGraphicAsset;
+import flixel.text.FlxText.FlxTextBorderStyle;
+import flixel.text.FlxText;
 import flixel.util.FlxColor;
-import openfl.geom.Rectangle;
 import openfl.display.BitmapData;
 import openfl.geom.Matrix;
+import openfl.geom.Rectangle;
 import openfl.text.TextFormat;
 
 /**
@@ -235,7 +235,7 @@ class FlxUITooltip extends FlxUIGroup
 		var minY:Float = Math.POSITIVE_INFINITY;
 		var maxY:Float = Math.NEGATIVE_INFINITY;
 
-		for (member in _sprites)
+		for (member in group.members)
 		{
 			if (member == null)
 				continue;

diff --git a/flixel/addons/ui/FlxUITypedButton.hx b/flixel/addons/ui/FlxUITypedButton.hx
@@ -1,27 +1,27 @@
 package flixel.addons.ui;
 
-import openfl.display.BitmapData;
-import openfl.errors.Error;
+import flixel.FlxG;
+import flixel.FlxSprite;
 import flixel.addons.ui.FlxUI.UIEventCallback;
 import flixel.addons.ui.interfaces.ICursorPointable;
 import flixel.addons.ui.interfaces.IFlxUIButton;
 import flixel.addons.ui.interfaces.IFlxUIClickable;
 import flixel.addons.ui.interfaces.IFlxUIWidget;
 import flixel.addons.ui.interfaces.IHasParams;
 import flixel.addons.ui.interfaces.IResizable;
-import flixel.FlxG;
-import flixel.FlxSprite;
 import flixel.graphics.FlxGraphic;
 import flixel.input.FlxInput;
 import flixel.input.IFlxInput;
+import flixel.math.FlxPoint;
+import flixel.system.FlxAssets.FlxGraphicAsset;
 import flixel.ui.FlxButton;
 import flixel.util.FlxArrayUtil;
 import flixel.util.FlxColor;
 import flixel.util.FlxDestroyUtil;
-import flixel.math.FlxPoint;
 import flixel.util.FlxStringUtil;
 import openfl.Assets;
-import flixel.system.FlxAssets.FlxGraphicAsset;
+import openfl.display.BitmapData;
+import openfl.errors.Error;
 
 class FlxUITypedButton<T:FlxSprite> extends FlxTypedButton<T> implements IFlxUIButton implements IResizable implements IFlxUIWidget implements IFlxUIClickable
 		implements IHasParams implements ICursorPointable
@@ -324,7 +324,7 @@ class FlxUITypedButton<T:FlxSprite> extends FlxTypedButton<T> implements IFlxUIB
 		super.draw();
 		if (has_toggle && toggled && toggle_label != null && toggle_label.visible == true)
 		{
-			toggle_label.cameras = cameras;
+			toggle_label._cameras = _cameras;
 			toggle_label.draw();
 		}
 	}