kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove third argument in onMouseMove

Browse Source
This commit is contained in:
Joshua Granick
2015-03-26 11:25:57 -07:00
parent 485f35de38
commit 1c62788e0c
7 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lime/_backend/flash/FlashApplication.hx
View File

@@ -192,7 +192,7 @@ class FlashApplication {
case "mouseMove":
parent.window.onMouseMove.dispatch (event.stageX, event.stageY, button);
parent.window.onMouseMove.dispatch (event.stageX, event.stageY);
case "mouseUp", "middleMouseUp", "rightMouseUp":

2
lime/_backend/html5/HTML5Window.hx
View File

@@ -216,7 +216,7 @@ class HTML5Window {
case "mousemove":
parent.onMouseMove.dispatch (x, y, event.button);
parent.onMouseMove.dispatch (x, y);
default:

4
lime/_backend/native/NativeApplication.hx
View File

@@ -185,8 +185,8 @@ class NativeApplication {
case MOUSE_MOVE:
parent.window.onMouseMove.dispatch (mouseEventInfo.x, mouseEventInfo.y, mouseEventInfo.button);
parent.window.onMouseMoveRelative.dispatch (mouseEventInfo.movementX, mouseEventInfo.movementY, mouseEventInfo.button);
parent.window.onMouseMove.dispatch (mouseEventInfo.x, mouseEventInfo.y);
parent.window.onMouseMoveRelative.dispatch (mouseEventInfo.movementX, mouseEventInfo.movementY);
case MOUSE_WHEEL:

10
lime/app/Application.hx
View File

@@ -261,26 +261,24 @@ class Application extends Module {
}
public override function onMouseMove (x:Float, y:Float, button:Int):Void {
public override function onMouseMove (x:Float, y:Float):Void {
for (module in modules) {
module.onMouseMove (x, y, button);
module.onMouseMove (x, y);
}
}
public override function onMouseMoveRelative (x:Float, y:Float, button:Int):Void {
public override function onMouseMoveRelative (x:Float, y:Float):Void {
#if (!openfl || openfl > "3.0.0-beta.2")
for (module in modules) {
module.onMouseMoveRelative (x, y, button);
module.onMouseMoveRelative (x, y);
}
#end
}

6
lime/app/IModule.hx
View File

@@ -91,18 +91,16 @@ interface IModule {
* @param y The current y coordinate of the mouse
* @param button The ID of the mouse button that was pressed
*/
public function onMouseMove (x:Float, y:Float, button:Int):Void;
public function onMouseMove (x:Float, y:Float):Void;
#if (!openfl || openfl > "3.0.0-beta.2")
/**
* Called when a mouse move relative event is fired
* @param x The x movement of the mouse
* @param y The y movement of the mouse
* @param button The ID of the mouse button that was pressed
*/
public function onMouseMoveRelative (x:Float, y:Float, button:Int):Void;
#end
public function onMouseMoveRelative (x:Float, y:Float):Void;
/**

4
lime/app/Module.hx
View File

@@ -66,7 +66,7 @@ class Module implements IModule {
* @param y The current y coordinate of the mouse
* @param button The ID of the mouse button that was pressed
*/
public function onMouseMove (x:Float, y:Float, button:Int):Void { }
public function onMouseMove (x:Float, y:Float):Void { }
/**
@@ -75,7 +75,7 @@ class Module implements IModule {
* @param y The y movement of the mouse
* @param button The ID of the mouse button that was pressed
*/
public function onMouseMoveRelative (x:Float, y:Float, button:Int):Void { }
public function onMouseMoveRelative (x:Float, y:Float):Void { }
/**

4
lime/ui/Window.hx
View File

@@ -24,8 +24,8 @@ class Window {
public var onKeyDown = new Event<KeyCode->KeyModifier->Void> ();
public var onKeyUp = new Event<KeyCode->KeyModifier->Void> ();
public var onMouseDown = new Event<Float->Float->Int->Void> ();
public var onMouseMove = new Event<Float->Float->Int->Void> ();
public var onMouseMoveRelative = new Event<Float->Float->Int->Void> ();
public var onMouseMove = new Event<Float->Float->Void> ();
public var onMouseMoveRelative = new Event<Float->Float->Void> ();
public var onMouseUp = new Event<Float->Float->Int->Void> ();
public var onMouseWheel = new Event<Float->Float->Void> ();
public var onTouchEnd = new Event<Float->Float->Int->Void> ();