Cleanup event types

2018-06-19 11:37:12 -07:00
parent 3491c5cf9c
commit 8e91009bc4
31 changed files with 160 additions and 329 deletions
--- a/project/include/ui/TouchEvent.h
+++ b/project/include/ui/TouchEvent.h
@@ -19,7 +19,7 @@ namespace lime {
 	};
 	
 	
-	struct HL_TouchEvent {
+	struct TouchEvent {
 		
 		hl_type* t;
 		int device;
@@ -31,28 +31,12 @@ namespace lime {
 		double x;
 		double y;
 		
-	};
-	
-	
-	class TouchEvent {
+		static ValuePointer* callback;
+		static ValuePointer* eventObject;
 		
-		public:
-			
-			static ValuePointer* callback;
-			static ValuePointer* eventObject;
-			
-			TouchEvent ();
-			
-			static void Dispatch (TouchEvent* event);
-			
-			uint32_t device;
-			float dx;
-			float dy;
-			uint32_t id;
-			float pressure;
-			TouchEventType type;
-			float x;
-			float y;
+		TouchEvent ();
+		
+		static void Dispatch (TouchEvent* event);
 		
 	};