Revert "Add cancel event flag in Key up event" 13/228313/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 20 Mar 2020 07:35:41 +0000 (07:35 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 20 Mar 2020 07:35:41 +0000 (07:35 +0000)
This reverts commit 12bd01d9f8a26aa77a551eb2c456b3af7fed9348.

Change-Id: If8efb3b2dbd1d5020d035e964979075e26d69fe8

dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp

index 2211081..509ddd4 100644 (file)
@@ -1026,15 +1026,6 @@ void WindowBaseEcoreWl::OnKeyUp( void* data, int type, void* event )
   {
     DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp\n" );
 
-#if defined(ECORE_VERSION_MAJOR) && (ECORE_VERSION_MAJOR >= 1) && defined(ECORE_VERSION_MINOR) && (ECORE_VERSION_MINOR >= 23)
-    // Cancel processing flag is sent because this key event will combine with the previous key. So, the event should not actually perform anything.
-    if( keyEvent->event_flags & ECORE_EVENT_FLAG_CANCEL )
-    {
-      DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp: This event flag indicates the event is canceled. \n" );
-      return;
-    }
-#endif // Since ecore 1.23 version
-
     std::string keyName( keyEvent->keyname );
     std::string logicalKey( "" );
     std::string keyString( "" );
index 21a8b64..89fae58 100755 (executable)
@@ -1173,15 +1173,6 @@ void WindowBaseEcoreWl2::OnKeyUp( void* data, int type, void* event )
   {
     DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl::OnKeyUp\n" );
 
-#if defined(ECORE_VERSION_MAJOR) && (ECORE_VERSION_MAJOR >= 1) && defined(ECORE_VERSION_MINOR) && (ECORE_VERSION_MINOR >= 23)
-    // Cancel processing flag is sent because this key event will combine with the previous key. So, the event should not actually perform anything.
-    if( keyEvent->event_flags & ECORE_EVENT_FLAG_CANCEL )
-    {
-      DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::OnKeyUp: This event flag indicates the event is canceled. \n" );
-      return;
-    }
-#endif // Since ecore 1.23 version
-
     std::string keyName( keyEvent->keyname );
     std::string logicalKey( "" );
     std::string keyString( "" );