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

another attempt to fix the signature error

Browse Source
This commit is contained in:
Shahar Marcus
2022-09-13 20:16:55 +03:00
parent 5bcea64afb
commit 1e45cbea7a
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/include/ui/MouseEvent.h
View File

@@ -24,13 +24,13 @@ namespace lime {
hl_type* t; hl_type* t;
int button; int button;
int clickCount;
double movementX; double movementX;
double movementY; double movementY;
MouseEventType type; MouseEventType type;
int windowID; int windowID;
double x; double x;
double y; double y;
int clickCount;
static ValuePointer* callback; static ValuePointer* callback;
static ValuePointer* eventObject; static ValuePointer* eventObject;

3
project/src/ui/MouseEvent.cpp
View File

@@ -77,13 +77,14 @@ namespace lime {
MouseEvent* eventObject = (MouseEvent*)MouseEvent::eventObject->Get (); MouseEvent* eventObject = (MouseEvent*)MouseEvent::eventObject->Get ();
eventObject->button = event->button; eventObject->button = event->button;
eventObject->clickCount = event->clickCount;
eventObject->movementX = event->movementX; eventObject->movementX = event->movementX;
eventObject->movementY = event->movementY; eventObject->movementY = event->movementY;
eventObject->type = event->type; eventObject->type = event->type;
eventObject->windowID = event->windowID; eventObject->windowID = event->windowID;
eventObject->x = event->x; eventObject->x = event->x;
eventObject->y = event->y; eventObject->y = event->y;
eventObject->clickCount = event->clickCount;
} }

4
src/lime/_internal/backend/html5/HTML5Window.hx
View File

@@ -803,7 +803,7 @@ class HTML5Window
if (touch == primaryTouch) if (touch == primaryTouch)
{ {
parent.onMouseDown.dispatch(x, y, 0); parent.onMouseDown.dispatch(x, y, 0, event.detail);
} }
} }
else else
@@ -839,7 +839,7 @@ class HTML5Window
if (touch == primaryTouch) if (touch == primaryTouch)
{ {
parent.onMouseUp.dispatch(x, y, 0); parent.onMouseUp.dispatch(x, y, 0, event.detail);
primaryTouch = null; primaryTouch = null;
} }

3
src/lime/_internal/backend/native/NativeApplication.hx
View File

@@ -780,13 +780,14 @@ class NativeApplication
@:keep /*private*/ class MouseEventInfo @:keep /*private*/ class MouseEventInfo
{ {
public var button:Int; public var button:Int;
public var clickCount:Int;
public var movementX:Float; public var movementX:Float;
public var movementY:Float; public var movementY:Float;
public var type:MouseEventType; public var type:MouseEventType;
public var windowID:Int; public var windowID:Int;
public var x:Float; public var x:Float;
public var y:Float; public var y:Float;
public var clickCount:Int;
public function new(type:MouseEventType = null, windowID:Int = 0, x:Float = 0, y:Float = 0, button:Int = 0, movementX:Float = 0, movementY:Float = 0, clickCount:Int = 0) public function new(type:MouseEventType = null, windowID:Int = 0, x:Float = 0, y:Float = 0, button:Int = 0, movementX:Float = 0, movementY:Float = 0, clickCount:Int = 0)
{ {