Touch: Replace Vector with Array

openfl · Jul 10, 2024 · 725ae8d · 725ae8d
1 parent 56ca012
commit 725ae8d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/src/starling/events/EventDispatcher.hx b/src/starling/events/EventDispatcher.hx
@@ -84,7 +84,7 @@ class EventDispatcher {
 
 				if (index != -1) {
 					if (__eventStack.indexOf(type) == -1) {
-						listeners.removeAt(index);
+						listeners.splice(index, 1);
 					} else {
 						var restListeners:Array<Function> = listeners.slice(0, index);
 

diff --git a/src/starling/events/Touch.hx b/src/starling/events/Touch.hx
@@ -12,7 +12,6 @@ package starling.events;
 
 import openfl.geom.Matrix;
 import openfl.geom.Point;
-import openfl.Vector;
 
 import starling.display.DisplayObject;
 import starling.utils.Pool;
@@ -54,7 +53,7 @@ class Touch
     @:noCompletion private var __width:Float;
     @:noCompletion private var __height:Float;
     @:noCompletion private var __cancelled:Bool;
-    @:noCompletion private var __bubbleChain:Vector<EventDispatcher>;
+    @:noCompletion private var __bubbleChain:Array<EventDispatcher>;
 
     /** Helper object. */
     private static var sHelperPoint:Point = new Point();
@@ -92,7 +91,7 @@ class Touch
         __tapCount = 0;
         __phase = TouchPhase.HOVER;
         __pressure = __width = __height = 1.0;
-        __bubbleChain = new Vector<EventDispatcher>();
+        __bubbleChain = new Array<EventDispatcher>();
         __timestamp = __startTimestamp = -1;
     }
 
@@ -204,15 +203,24 @@ class Touch
             var length:Int = 1;
             var element:DisplayObject = __target;
 
-            __bubbleChain.length = 1;
+            #if (haxe_ver >= 4.0)
+			__bubbleChain.resize(1);
+			#else
+			ArrayUtil.resize(__bubbleChain, 1);
+			#end
+
             __bubbleChain[0] = element;
 
             while ((element = element.parent) != null)
                 __bubbleChain[length++] = element;
         }
         else
         {
-            __bubbleChain.length = 0;
+            #if (haxe_ver >= 4.0)
+			__bubbleChain.resize(0);
+			#else
+			ArrayUtil.resize(__bubbleChain, 0);
+			#end
         }
     }
 
@@ -371,9 +379,9 @@ class Touch
     }
 
     /** @private */
-    @:allow(starling) private var bubbleChain(get, never):Vector<EventDispatcher>;
-    private function get_bubbleChain():Vector<EventDispatcher>
+    @:allow(starling) private var bubbleChain(get, never):Array<EventDispatcher>;
+    private function get_bubbleChain():Array<EventDispatcher>
     {
-        return __bubbleChain.concat();
+        return __bubbleChain.copy();
     }
 }