From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 23 Mar 2020 01:10:16 +0000 (+0900)
Subject: Revert "Add cancel event flag in Key up event"
X-Git-Tag: dali_1.5.4~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f871e079f15dcbc7f86e91799f9c237d58ec6380;hp=f630a2249ff1cc1b39faf6dba7355ba2ac8a9898;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Revert "Add cancel event flag in Key up event"

This reverts commit f630a2249ff1cc1b39faf6dba7355ba2ac8a9898.

Change-Id: I6b6e28a9da082cfb8f6832849850bb68f4869f61
---

diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
index 2211081..509ddd4 100644
--- a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
@@ -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( "" );
diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
index 21a8b64..89fae58 100755
--- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
@@ -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( "" );