Adding Dali::KeyEvent convertor

Change-Id: I369dfdffa8171611b5796a0576eb5633268d2300

diff --git a/automated-tests/src/dali/utc-Dali-KeyEvent.cpp b/automated-tests/src/dali/utc-Dali-KeyEvent.cpp
index a8b39a9..69f8af1 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-KeyEvent.cpp
+++ b/automated-tests/src/dali/utc-Dali-KeyEvent.cpp
@@ -269,3 +269,22 @@ int UtcDaliIntegrationKeyEvent(void)
   }
   END_TEST;
 }
+
+int UtcDaliIntegrationKeyEventConvertor(void)
+{
+  TestApplication application;
+
+  KeyEvent event(TEST_STRING_1,"i", 99, SHIFT_MODIFIER, 0lu, KeyEvent::Down);  // set name to test, key string to i and modifier to shift
+
+  Integration::KeyEvent keyEvent( event );
+
+  DALI_TEST_EQUALS( keyEvent.type, Integration::Event::Key, TEST_LOCATION );
+  DALI_TEST_CHECK( keyEvent.keyName == TEST_STRING_1 );
+  DALI_TEST_CHECK( keyEvent.keyString == "i" );
+  DALI_TEST_EQUALS( keyEvent.keyCode, 99, TEST_LOCATION );
+  DALI_TEST_EQUALS( keyEvent.keyModifier, SHIFT_MODIFIER, TEST_LOCATION );
+  DALI_TEST_EQUALS( keyEvent.time, 0lu, TEST_LOCATION );
+  DALI_TEST_EQUALS( keyEvent.state, Integration::KeyEvent::Down, TEST_LOCATION);
+
+  END_TEST;
+}

diff --git a/dali/integration-api/events/key-event-integ.cpp b/dali/integration-api/events/key-event-integ.cpp
index 80dc7cc..425f224 100644 (file)
--- a/dali/integration-api/events/key-event-integ.cpp
+++ b/dali/integration-api/events/key-event-integ.cpp
@@ -46,6 +46,17 @@ KeyEvent::KeyEvent(const std::string& keyName, const std::string& keyString, int
 {
 }
 
+KeyEvent::KeyEvent( const Dali::KeyEvent& event )
+: Event(Key),
+  keyName( event.keyPressedName ),
+  keyString( event.keyPressed ),
+  keyCode( event.keyCode ),
+  keyModifier( event.keyModifier ),
+  time( event.time ),
+  state( static_cast< Integration::KeyEvent::State >( event.state ) )
+{
+}
+
 KeyEvent::~KeyEvent()
 {
 }

diff --git a/dali/integration-api/events/key-event-integ.h b/dali/integration-api/events/key-event-integ.h
index 26762ed..39543ca 100644 (file)
--- a/dali/integration-api/events/key-event-integ.h
+++ b/dali/integration-api/events/key-event-integ.h
@@ -23,6 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/events/event.h>
+#include <dali/public-api/events/key-event.h>
 
 namespace Dali DALI_IMPORT_API
 {
@@ -68,6 +69,12 @@ struct KeyEvent : public Event
            unsigned long timeStamp,
            const State& keyState);
 
+  /*
+   * Constructor, creates a Integration::KeyEvent from a Dali::KeyEvent
+   * @param[in] event Dali::KeyEvent to convert from
+   */
+  explicit KeyEvent( const Dali::KeyEvent& event );
+
   /**
    * Virtual destructor
    */