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

Cleanup event types

Browse Source
This commit is contained in:
Joshua Granick
2018-06-19 11:37:12 -07:00
parent 3491c5cf9c
commit 8e91009bc4
31 changed files with 160 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
project/src/ui/DropEvent.cpp
View File

@@ -37,12 +37,12 @@ namespace lime {
value object = (value)DropEvent::eventObject->Get ();
alloc_field (object, id_file, alloc_string (event->file));
alloc_field (object, id_file, alloc_string ((const char*)event->file));
alloc_field (object, id_type, alloc_int (event->type));
} else {
HL_DropEvent* eventObject = (HL_DropEvent*)DropEvent::eventObject->Get ();
DropEvent* eventObject = (DropEvent*)DropEvent::eventObject->Get ();
// TODO
// eventObject->file = event->file;

6
project/src/ui/GamepadEvent.cpp
View File

@@ -39,7 +39,7 @@ namespace lime {
id_button = val_id ("button");
id_id = val_id ("id");
id_type = val_id ("type");
id_value = val_id ("value");
id_value = val_id ("axisValue");
init = true;
}
@@ -54,13 +54,13 @@ namespace lime {
} else {
HL_GamepadEvent* eventObject = (HL_GamepadEvent*)GamepadEvent::eventObject->Get ();
GamepadEvent* eventObject = (GamepadEvent*)GamepadEvent::eventObject->Get ();
eventObject->axis = event->axis;
eventObject->button = event->button;
eventObject->id = event->id;
eventObject->type = event->type;
eventObject->value = event->axisValue;
eventObject->axisValue = event->axisValue;
}

6
project/src/ui/JoystickEvent.cpp
View File

@@ -40,7 +40,7 @@ namespace lime {
id_id = val_id ("id");
id_index = val_id ("index");
id_type = val_id ("type");
id_value = val_id ("value");
id_value = val_id ("eventValue");
id_x = val_id ("x");
id_y = val_id ("y");
init = true;
@@ -58,12 +58,12 @@ namespace lime {
} else {
HL_JoystickEvent* eventObject = (HL_JoystickEvent*)JoystickEvent::eventObject->Get ();
JoystickEvent* eventObject = (JoystickEvent*)JoystickEvent::eventObject->Get ();
eventObject->id = event->id;
eventObject->index = event->index;
eventObject->type = event->type;
eventObject->value = event->eventValue;
eventObject->eventValue = event->eventValue;
eventObject->x = event->x;
eventObject->y = event->y;

2
project/src/ui/KeyEvent.cpp
View File

@@ -50,7 +50,7 @@ namespace lime {
} else {
HL_KeyEvent* eventObject = (HL_KeyEvent*)KeyEvent::eventObject->Get ();
KeyEvent* eventObject = (KeyEvent*)KeyEvent::eventObject->Get ();
eventObject->keyCode = event->keyCode;
eventObject->modifier = event->modifier;

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

@@ -67,7 +67,7 @@ namespace lime {
} else {
HL_MouseEvent* eventObject = (HL_MouseEvent*)MouseEvent::eventObject->Get ();
MouseEvent* eventObject = (MouseEvent*)MouseEvent::eventObject->Get ();
eventObject->movementX = event->movementX;
eventObject->movementY = event->movementY;

8
project/src/ui/TextEvent.cpp
View File

@@ -20,6 +20,7 @@ namespace lime {
length = 0;
start = 0;
text = 0;
windowID = 0;
}
@@ -51,13 +52,13 @@ namespace lime {
}
alloc_field (object, id_text, alloc_string (event->text));
alloc_field (object, id_text, alloc_string ((const char*)event->text));
alloc_field (object, id_type, alloc_int (event->type));
alloc_field (object, id_windowID, alloc_int (event->windowID));
} else {
HL_TextEvent* eventObject = (HL_TextEvent*)TextEvent::eventObject->Get ();
TextEvent* eventObject = (TextEvent*)TextEvent::eventObject->Get ();
if (event->type != TEXT_INPUT) {
@@ -66,8 +67,7 @@ namespace lime {
}
// TODO
//eventObject->text = event->text;
eventObject->text = event->text;
eventObject->type = event->type;
eventObject->windowID = event->windowID;

2
project/src/ui/TouchEvent.cpp
View File

@@ -66,7 +66,7 @@ namespace lime {
} else {
HL_TouchEvent* eventObject = (HL_TouchEvent*)TouchEvent::eventObject->Get ();
TouchEvent* eventObject = (TouchEvent*)TouchEvent::eventObject->Get ();
eventObject->device = event->device;
eventObject->dx = event->dx;

2
project/src/ui/WindowEvent.cpp
View File

@@ -73,7 +73,7 @@ namespace lime {
} else {
HL_WindowEvent* eventObject = (HL_WindowEvent*)WindowEvent::eventObject->Get ();
WindowEvent* eventObject = (WindowEvent*)WindowEvent::eventObject->Get ();
eventObject->type = event->type;
eventObject->windowID = event->windowID;