Add Integration API to Create public event type

Change-Id: If8ee74f5011866dffaafc82c46d7f09e29490556

diff --git a/dali/integration-api/events/key-event-integ.cpp b/dali/integration-api/events/key-event-integ.cpp
index db7e1bc..d314f4f 100755 (executable)
--- a/dali/integration-api/events/key-event-integ.cpp
+++ b/dali/integration-api/events/key-event-integ.cpp
@@ -87,6 +87,18 @@ KeyEvent::~KeyEvent()
 {
 }
 
+Dali::KeyEvent KeyEvent::Convert( const Dali::Integration::KeyEvent& event )
+{
+  Dali::KeyEvent keyEvent(event.keyName, event.keyString, event.keyCode, event.keyModifier, event.time, static_cast<Dali::KeyEvent::State>(event.state));
+  GetImplementation( &keyEvent )->SetLogicalKey( event.logicalKey );
+  GetImplementation( &keyEvent )->SetCompose( event.compose );
+  GetImplementation( &keyEvent )->SetDeviceName( event.deviceName );
+  GetImplementation( &keyEvent )->SetDeviceClass( event.deviceClass );
+  GetImplementation( &keyEvent )->SetDeviceSubclass( event.deviceSubclass );
+
+  return keyEvent;
+}
+
 } // namespace Integration
 
 } // namespace Dali

diff --git a/dali/integration-api/events/key-event-integ.h b/dali/integration-api/events/key-event-integ.h
index 4eadad7..46873b4 100755 (executable)
--- a/dali/integration-api/events/key-event-integ.h
+++ b/dali/integration-api/events/key-event-integ.h
@@ -90,6 +90,14 @@ struct DALI_CORE_API KeyEvent : public Event
    */
   virtual ~KeyEvent();
 
+  /**
+   * @brief Creates a Dali::KeyEvent from a Integration::KeyEvent
+   *
+   * @param[in] event Integration::KeyEvent to convert from
+   * @return The Dali::KeyEvent
+   */
+  static Dali::KeyEvent Convert( const Dali::Integration::KeyEvent& event );
+
   // Data
 
   /**

diff --git a/dali/integration-api/events/touch-integ.cpp b/dali/integration-api/events/touch-integ.cpp
index 978e9ed..5ab1e04 100644 (file)
--- a/dali/integration-api/events/touch-integ.cpp
+++ b/dali/integration-api/events/touch-integ.cpp
@@ -30,6 +30,14 @@ Dali::TouchEvent NewTouchEvent(uint32_t timestamp, const TouchPoint& point)
   return handle;
 }
 
+Dali::TouchEvent NewTouchEvent( uint32_t timeStamp, const Dali::Integration::Point& point )
+{
+  Internal::TouchEventPtr touchEventImpl( new Internal::TouchEvent( timeStamp ) );
+  touchEventImpl->AddPoint( point );
+  Dali::TouchEvent handle( touchEventImpl.Get() );
+  return handle;
+}
+
 } // namespace Integration
 
 } // namespace Dali

diff --git a/dali/integration-api/events/touch-integ.h b/dali/integration-api/events/touch-integ.h
index 4499472..d6f3d8b 100644 (file)
--- a/dali/integration-api/events/touch-integ.h
+++ b/dali/integration-api/events/touch-integ.h
@@ -21,6 +21,7 @@
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/events/touch-point.h>
+#include <dali/integration-api/events/point.h>
 
 namespace Dali
 {
@@ -37,6 +38,15 @@ namespace Integration
  */
 DALI_CORE_API Dali::TouchEvent NewTouchEvent(uint32_t timestamp, const TouchPoint& point);
 
+/**
+ * Create a new touch data handle from timestamp and point.
+ *
+ * @param[in] timestamp The timestamp of the touch event.
+ * @param[in] point The point on screen where the touch occurred.
+ * @return A new touch data handle.
+ */
+DALI_CORE_API Dali::TouchEvent NewTouchEvent( uint32_t timeStamp, const Dali::Integration::Point& point );
+
 } // namespace Integration
 
 } // namespace Dali