Skip to content

Fix for Actuate more strict #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MatthijsKamstra wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for Actuate more strict #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions com/roxstudio/haxe/gesture/RoxGestureAgent.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package com.roxstudio.haxe.gesture;

import nme.ui.MultitouchInputMode;
import nme.display.Sprite;
import nme.display.DisplayObjectContainer;
import openfl.ui.MultitouchInputMode;
import openfl.display.Sprite;
import openfl.display.DisplayObjectContainer;
import motion.actuators.GenericActuator;
import motion.Actuate;
import com.roxstudio.haxe.gesture.RoxGestureEvent;
import haxe.Timer;
import nme.Lib;
import nme.display.InteractiveObject;
import nme.events.Event;
import nme.events.MouseEvent;
import nme.events.TouchEvent;
import nme.geom.Point;
import nme.geom.Rectangle;
import nme.ui.Multitouch;
import openfl.Lib;
import openfl.display.InteractiveObject;
import openfl.events.Event;
import openfl.events.MouseEvent;
import openfl.events.TouchEvent;
import openfl.geom.Point;
import openfl.geom.Rectangle;
import openfl.ui.Multitouch;

#if haxe3
private typedef Hash<T> = Map<String, T>;
Expand Down Expand Up @@ -65,8 +65,8 @@ class RoxGestureAgent {
private var touchList: List<TouchPoint>;
private var listenEvents: Array<String>;
private var handler: Dynamic -> Void;
private var longPressTimer: GenericActuator;
private var tweener: GenericActuator;
private var longPressTimer: GenericActuator<Dynamic>;
private var tweener: GenericActuator<Dynamic>;
private var overlay: Sprite; // used in capture mode, to capture events outside the owner
/**
* READY -> begin:BEGIN -> end:tap
Expand Down Expand Up @@ -118,7 +118,8 @@ class RoxGestureAgent {

public inline function stopTween() {
if (tweener != null) {
tweener.stop(null, false, false);
Actuate.stop(tweener, null, false, false);
//tweener.stop(null, false, false);
tweener = null;
}
}
Expand Down Expand Up @@ -333,7 +334,8 @@ class RoxGestureAgent {

private inline function cancelLongPress() {
if (longPressTimer != null) {
longPressTimer.stop(null, false, false);
Actuate.stop(longPressTimer, null, false, false);
//longPressTimer.stop(null, false, false);
longPressTimer = null;
}
}
Expand Down