Merge branch 'devel/master' into tizen

diff --git a/dali-extension/internal/evas-plugin/evas-event-handler.cpp b/dali-extension/internal/evas-plugin/evas-event-handler.cpp
index 517cbd5..a40e7db 100644 (file)
--- a/dali-extension/internal/evas-plugin/evas-event-handler.cpp
+++ b/dali-extension/internal/evas-plugin/evas-event-handler.cpp
@@ -567,7 +567,7 @@ void EvasEventHandler::OnEvasObjectMouseDown( void *data, Evas* evas, Evas_Objec
   Evas_Coord screenX = 0.0f, screenY = 0.0f;
   GetScreenPosition( eventMouseDown->canvas.x, eventMouseDown->canvas.y, evasObject, screenX, screenY );
 
-  Dali::Integration::Point point( TouchPoint( TOUCH_DEVICE_ID, TouchPoint::Down, screenX, screenY ) );
+  Dali::Integration::Point point( TouchPoint( TOUCH_DEVICE_ID, PointState::DOWN, screenX, screenY ) );
   unsigned long timeStamp = eventMouseDown->timestamp;
   if( timeStamp < 1 )
   {
@@ -585,7 +585,7 @@ void EvasEventHandler::OnEvasObjectMouseUp( void *data, Evas* evas, Evas_Object*
   Evas_Coord screenX = 0.0f, screenY = 0.0f;
   GetScreenPosition( eventMouseUp->canvas.x, eventMouseUp->canvas.y, evasObject, screenX, screenY );
 
-  Dali::Integration::Point point( TouchPoint( TOUCH_DEVICE_ID, TouchPoint::Up, screenX, screenY ) );
+  Dali::Integration::Point point( TouchPoint( TOUCH_DEVICE_ID, PointState::UP, screenX, screenY ) );
   unsigned long timeStamp = eventMouseUp->timestamp;
   if( timeStamp < 1 )
   {
@@ -603,7 +603,7 @@ void EvasEventHandler::OnEvasObjectMouseMove( void *data, Evas* evas, Evas_Objec
   Evas_Coord screenX = 0.0f, screenY = 0.0f;
   GetScreenPosition( eventMouseMove->cur.canvas.x, eventMouseMove->cur.canvas.y, evasObject, screenX, screenY );
 
-  Dali::Integration::Point point( TouchPoint( TOUCH_DEVICE_ID, TouchPoint::Motion, screenX, screenY ) );
+  Dali::Integration::Point point( TouchPoint( TOUCH_DEVICE_ID, PointState::MOTION, screenX, screenY ) );
   unsigned long timeStamp = eventMouseMove->timestamp;
   if( timeStamp < 1 )
   {
@@ -644,7 +644,7 @@ void EvasEventHandler::OnEvasObjectMultiTouchDown( void *data, Evas* evas, Evas_
   Evas_Coord screenX = 0.0f, screenY = 0.0f;
   GetScreenPosition( eventMultiDown->canvas.x, eventMultiDown->canvas.y, evasObject, screenX, screenY );
 
-  Dali::Integration::Point point( TouchPoint( eventMultiDown->device, TouchPoint::Down, screenX, screenY ) );
+  Dali::Integration::Point point( TouchPoint( eventMultiDown->device, PointState::DOWN, screenX, screenY ) );
   unsigned long timeStamp = eventMultiDown->timestamp;
   if( timeStamp < 1 )
   {
@@ -662,7 +662,7 @@ void EvasEventHandler::OnEvasObjectMultiTouchUp( void *data, Evas* evas, Evas_Ob
   Evas_Coord screenX = 0.0f, screenY = 0.0f;
   GetScreenPosition( eventMultiUp->canvas.x, eventMultiUp->canvas.y, evasObject, screenX, screenY );
 
-  Dali::Integration::Point point( TouchPoint( eventMultiUp->device, TouchPoint::Up, screenX, screenY ) );
+  Dali::Integration::Point point( TouchPoint( eventMultiUp->device, PointState::UP, screenX, screenY ) );
   unsigned long timeStamp = eventMultiUp->timestamp;
   if( timeStamp < 1 )
   {
@@ -680,7 +680,7 @@ void EvasEventHandler::OnEvasObjectMultiTouchMove( void *data, Evas* evas, Evas_
   Evas_Coord screenX = 0.0f, screenY = 0.0f;
   GetScreenPosition( eventMultiMove->cur.canvas.x, eventMultiMove->cur.canvas.y, evasObject, screenX, screenY );
 
-  Dali::Integration::Point point( TouchPoint( eventMultiMove->device, TouchPoint::Motion, screenX, screenY ) );
+  Dali::Integration::Point point( TouchPoint( eventMultiMove->device, PointState::MOTION, screenX, screenY ) );
   unsigned long timeStamp = eventMultiMove->timestamp;
   if( timeStamp < 1 )
   {
@@ -698,7 +698,7 @@ void EvasEventHandler::OnEvasObjectKeyDown( void *data, Evas* evas, Evas_Object*
   // Create KeyEvent
   Integration::KeyEvent integKeyEvent;
 
-  integKeyEvent.state = Integration::KeyEvent::Down;
+  integKeyEvent.state = Integration::KeyEvent::DOWN;
 
   FillIntegrationKeyEvent( keyEvent, integKeyEvent );
 
@@ -713,7 +713,7 @@ void EvasEventHandler::OnEvasObjectKeyUp( void *data, Evas* evas, Evas_Object* e
   // Create KeyEvent
   Integration::KeyEvent integKeyEvent;
 
-  integKeyEvent.state = Integration::KeyEvent::Up;
+  integKeyEvent.state = Integration::KeyEvent::UP;
 
   FillIntegrationKeyEvent( keyEvent, integKeyEvent );
 
@@ -897,7 +897,7 @@ void EvasEventHandler::OnEvasObjectSmartFocused( void *data, Evas_Object* evasOb
       if( elm_win_focus_highlight_enabled_get( topWidget ) == EINA_TRUE )
       {
         // To allow that KeyboardFocusManager can handle the keyboard focus
-        Dali::Integration::KeyEvent fakeKeyEvent( Dali::KeyEvent( "", "", 0, 0, 100, KeyEvent::Down ) );
+        Dali::Integration::KeyEvent fakeKeyEvent( "", "", "", 0, 0, 100, Dali::Integration::KeyEvent::DOWN, "", "", Device::Class::NONE, Device::Subclass::NONE );
 
         evasPlugin.OnEvasObjectKeyEvent( fakeKeyEvent );
       }

diff --git a/dali-extension/internal/evas-plugin/scene-impl.cpp b/dali-extension/internal/evas-plugin/scene-impl.cpp
index c92dc92..d508333 100644 (file)
--- a/dali-extension/internal/evas-plugin/scene-impl.cpp
+++ b/dali-extension/internal/evas-plugin/scene-impl.cpp
@@ -356,23 +356,23 @@ bool Scene::OnElmAccessibilityActionEvent( AccessActionInfo& accessActionInfo )
         {
           int touchType = accessActionInfo.mouseType;
 
-          TouchPoint::State state( TouchPoint::Down );
+          PointState::Type state( PointState::DOWN );
 
           if( touchType == 0 )
           {
-            state = TouchPoint::Down; // mouse down
+            state = PointState::DOWN; // mouse down
           }
           else if( touchType == 1 )
           {
-            state = TouchPoint::Motion; // mouse move
+            state = PointState::MOTION; // mouse move
           }
           else if( touchType == 2 )
           {
-            state = TouchPoint::Up; // mouse up
+            state = PointState::UP; // mouse up
           }
           else
           {
-            state = TouchPoint::Interrupted; // error
+            state = PointState::INTERRUPTED; // error
           }
 
           // Send touch event to accessibility manager.

diff --git a/dali-extension/key/key-extension.cpp b/dali-extension/key/key-extension.cpp
index fbf64a2..94d65b9 100644 (file)
--- a/dali-extension/key/key-extension.cpp
+++ b/dali-extension/key/key-extension.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ bool IsExtensionKey( const Dali::KeyEvent& keyEvent, Dali::EXTENSION_KEY daliKey
 
   for( size_t i = 0 ; i < sizeof(mKeyLookupTable) / sizeof(KeyExtensionPlugin::KeyLookup) ; i++ )
   {
-    if( !keyEvent.keyPressedName.compare( mKeyLookupTable[i].keyName ) )
+    if( !keyEvent.GetKeyName().compare( mKeyLookupTable[i].keyName ) )
     {
       key = mKeyLookupTable[i].daliKeyCode;
       break;

diff --git a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
index 31a12a3..060a242 100644 (file)
--- a/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
+++ b/dali-extension/web-engine-chromium/tizen-web-engine-chromium.cpp
@@ -371,15 +371,15 @@ public:
     return false;
   }
 
-  bool SendKeyEvent( const KeyEvent& keyEvent )
+  bool SendKeyEvent( const Dali::KeyEvent& keyEvent )
   {
     void* evasKeyEvent = 0;
-    if( keyEvent.state == KeyEvent::Down )
+    if( keyEvent.GetState() == Dali::KeyEvent::DOWN )
     {
       Evas_Event_Key_Down downEvent;
       memset( &downEvent, 0, sizeof(Evas_Event_Key_Down) );
-      downEvent.key = keyEvent.keyPressedName.c_str();
-      downEvent.string = keyEvent.keyPressed.c_str();
+      downEvent.key = keyEvent.GetKeyName().c_str();
+      downEvent.string = keyEvent.GetKeyString().c_str();
       evasKeyEvent = static_cast<void*>(&downEvent);
       ewk_view_send_key_event( mWebView, evasKeyEvent, true );
     }
@@ -387,8 +387,8 @@ public:
     {
       Evas_Event_Key_Up upEvent;
       memset(&upEvent, 0, sizeof(Evas_Event_Key_Up));
-      upEvent.key = keyEvent.keyPressedName.c_str();
-      upEvent.string = keyEvent.keyPressed.c_str();
+      upEvent.key = keyEvent.GetKeyName().c_str();
+      upEvent.string = keyEvent.GetKeyString().c_str();
       evasKeyEvent = static_cast<void*>(&upEvent);
       ewk_view_send_key_event( mWebView, evasKeyEvent, false );
      }

diff --git a/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp b/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp
index dd63972..351001b 100644 (file)
--- a/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp
+++ b/dali-extension/web-engine-lwe/tizen-web-engine-lwe.cpp
@@ -783,20 +783,20 @@ void TizenWebEngineLWE::DispatchKeyUpEvent( LWE::KeyValue keyCode )
 bool TizenWebEngineLWE::SendKeyEvent( const Dali::KeyEvent& event )
 {
   LWE::KeyValue keyValue = LWE::KeyValue::UnidentifiedKey;
-  if( 32 < event.keyPressed.c_str()[0] && 127 > event.keyPressed.c_str()[0] )
+  if( 32 < event.GetKeyString().c_str()[0] && 127 > event.GetKeyString().c_str()[0] )
   {
-    keyValue = static_cast<LWE::KeyValue>( event.keyPressed.c_str()[0] );
+    keyValue = static_cast<LWE::KeyValue>( event.GetKeyString().c_str()[0] );
   }
   else
   {
-    keyValue = KeyStringToKeyValue( event.keyPressedName.c_str(), event.keyModifier & 1 );
+    keyValue = KeyStringToKeyValue( event.GetKeyName().c_str(), event.GetKeyModifier() & 1 );
   }
-  if( event.state == Dali::KeyEvent::Down )
+  if( event.GetState() == Dali::KeyEvent::DOWN )
   {
     DispatchKeyDownEvent( keyValue );
     DispatchKeyPressEvent( keyValue );
   }
-  else if( event.state == Dali::KeyEvent::Up )
+  else if( event.GetState() == Dali::KeyEvent::UP )
   {
     DispatchKeyUpEvent( keyValue );
   }

diff --git a/packaging/dali-extension.spec b/packaging/dali-extension.spec
index 52bdc6e..16bbdbe 100755 (executable)
--- a/packaging/dali-extension.spec
+++ b/packaging/dali-extension.spec
@@ -7,7 +7,7 @@
 
 Name:       dali2-extension
 Summary:    The DALi Tizen Extensions
-Version:    1.9.26
+Version:    1.9.27
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT