소스 검색

fixed Stage

ncannasse 8 년 전
부모
커밋
876cb152f4
4개의 변경된 파일22개의 추가작업 그리고 22개의 파일을 삭제
  1. 4 4
      hxd/Stage.flash.hx
  2. 10 10
      hxd/Stage.hl.hx
  3. 4 4
      hxd/Stage.hx
  4. 4 4
      hxd/Stage.js.hx

+ 4 - 4
hxd/Stage.flash.hx

@@ -5,10 +5,10 @@ class Stage {
 	var resizeEvents : List<Void -> Void>;
 	var eventTargets : List<Event -> Void>;
 
-	public var width(get, null) : Int;
-	public var height(get, null) : Int;
-	public var mouseX(get, null) : Int;
-	public var mouseY(get, null) : Int;
+	public var width(get, never) : Int;
+	public var height(get, never) : Int;
+	public var mouseX(get, never) : Int;
+	public var mouseY(get, never) : Int;
 	public var mouseLock(get, set) : Bool;
 	public var vsync(get, set) : Bool;
 

+ 10 - 10
hxd/Stage.hl.hx

@@ -7,10 +7,10 @@ class Stage {
 	var resizeEvents : List<Void -> Void>;
 	var eventTargets : List<Event -> Void>;
 
-	public var width(get, null) : Int;
-	public var height(get, null) : Int;
-	public var mouseX(get, null) : Int;
-	public var mouseY(get, null) : Int;
+	public var width(get, never) : Int;
+	public var height(get, never) : Int;
+	public var mouseX(get, never) : Int;
+	public var mouseY(get, never) : Int;
 	public var mouseLock(get, set) : Bool;
 	public var vsync(get, set) : Bool;
 
@@ -141,8 +141,8 @@ class Stage {
 			default:
 			}
 		case MouseDown:
-			mouseX = e.mouseX;
-			mouseY = e.mouseY;
+			curMouseX = e.mouseX;
+			curMouseY = e.mouseY;
 			eh = new Event(EPush, e.mouseX, e.mouseY);
 			// middle button -> 2 / right button -> 1
 			eh.button = switch( e.button - 1 ) {
@@ -152,8 +152,8 @@ class Stage {
 			case x: x;
 			}
 		case MouseUp:
-			mouseX = e.mouseX;
-			mouseY = e.mouseY;
+			curMouseX = e.mouseX;
+			curMouseY = e.mouseY;
 			eh = new Event(ERelease, e.mouseX, e.mouseY);
 			eh.button = switch( e.button - 1 ) {
 			case 0: 0;
@@ -162,8 +162,8 @@ class Stage {
 			case x: x;
 			};
 		case MouseMove:
-			mouseX = e.mouseX;
-			mouseY = e.mouseY;
+			curMouseX = e.mouseX;
+			curMouseY = e.mouseY;
 			eh = new Event(EMove, e.mouseX, e.mouseY);
 		case KeyDown:
 			eh = new Event(EKeyDown);

+ 4 - 4
hxd/Stage.hx

@@ -5,10 +5,10 @@ class Stage {
 	var resizeEvents : List<Void -> Void>;
 	var eventTargets : List<Event -> Void>;
 
-	public var width(get, null) : Int;
-	public var height(get, null) : Int;
-	public var mouseX(get, null) : Int;
-	public var mouseY(get, null) : Int;
+	public var width(get, never) : Int;
+	public var height(get, never) : Int;
+	public var mouseX(get, never) : Int;
+	public var mouseY(get, never) : Int;
 	public var mouseLock(get, set) : Bool;
 	public var vsync(get, set) : Bool;
 

+ 4 - 4
hxd/Stage.js.hx

@@ -5,10 +5,10 @@ class Stage {
 	var resizeEvents : List<Void -> Void>;
 	var eventTargets : List<Event -> Void>;
 
-	public var width(get, null) : Int;
-	public var height(get, null) : Int;
-	public var mouseX(get, null) : Int;
-	public var mouseY(get, null) : Int;
+	public var width(get, never) : Int;
+	public var height(get, never) : Int;
+	public var mouseX(get, never) : Int;
+	public var mouseY(get, never) : Int;
 	public var mouseLock(get, set) : Bool;
 	public var vsync(get, set) : Bool;