Revert "Revert "Revert "[Tizen] Revert "Use touch consumed return to set whether...

[platform/core/uifw/dali-core.git] / dali / internal / event / events / gesture-detector-impl.cpp

diff --git a/dali/internal/event/events/gesture-detector-impl.cpp b/dali/internal/event/events/gesture-detector-impl.cpp
index 7748d36..8f2b0d0 100644 (file)
--- a/dali/internal/event/events/gesture-detector-impl.cpp
+++ b/dali/internal/event/events/gesture-detector-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 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.
@@ -34,18 +34,13 @@ namespace Dali
 namespace Internal
 {
 
-GestureDetector::GestureDetector( DevelGesture::Type type, const SceneGraph::PropertyOwner* sceneObject )
+GestureDetector::GestureDetector( GestureType::Value type, const SceneGraph::PropertyOwner* sceneObject )
 : Object( sceneObject ),
   mType( type ),
   mGestureEventProcessor( ThreadLocalStorage::Get().GetGestureEventProcessor() )
 {
 }
 
-GestureDetector::GestureDetector( Gesture::Type type, const SceneGraph::PropertyOwner* sceneObject )
-: GestureDetector( static_cast< DevelGesture::Type >( type ), sceneObject )
-{
-}
-
 GestureDetector::~GestureDetector()
 {
   if ( !mPendingAttachActors.empty() )
@@ -83,7 +78,7 @@ void GestureDetector::Attach( Actor& actor )
 {
   if ( !IsAttached( actor ) )
   {
-    if( actor.OnStage() )
+    if( actor.OnScene() )
     {
       // Register with EventProcessor if first actor being added
       if( mAttachedActors.empty() )