Add null check for mTextureSet.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / drag-drop-detector / drag-and-drop-detector-impl.cpp

diff --git a/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.cpp b/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.cpp
index 34be65a..994932e 100644 (file)
--- a/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.cpp
+++ b/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.cpp
@@ -19,7 +19,7 @@
 #include <dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.h>
 
 #include <dali/public-api/events/point-state.h>
 #include <dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.h>
 
 #include <dali/public-api/events/point-state.h>

-#include <dali/public-api/events/touch-data.h>
+#include <dali/public-api/events/touch-event.h>

 
 namespace Dali
 {
 
 namespace Dali
 {


@@ -50,7 +50,7 @@ void DragAndDropDetector::Attach(Dali::Toolkit::Control& control)
       }
     }
     mControls.push_back(control);
       }
     }
     mControls.push_back(control);

-    control.TouchSignal().Connect(this, &DragAndDropDetector::OnDrag);
+    control.TouchedSignal().Connect(this, &DragAndDropDetector::OnDrag);

     mFirstEnter.push_back(control.GetProperty< int >( Actor::Property::ID ));
     mPanGestureDetector.Attach(control);
     mPanGestureDetector.DetectedSignal().Connect(this, &DragAndDropDetector::OnPan);
     mFirstEnter.push_back(control.GetProperty< int >( Actor::Property::ID ));
     mPanGestureDetector.Attach(control);
     mPanGestureDetector.DetectedSignal().Connect(this, &DragAndDropDetector::OnPan);


@@ -71,7 +71,7 @@ void DragAndDropDetector::Detach(Dali::Toolkit::Control& control)
 
     if(match != mControls.end())
     {
 
     if(match != mControls.end())
     {

-      match->TouchSignal().Disconnect(this, &DragAndDropDetector::OnDrag);
+      match->TouchedSignal().Disconnect(this, &DragAndDropDetector::OnDrag);

       mPanGestureDetector.Detach(*match);
       mFirstEnter.erase(std::find(mFirstEnter.begin(), mFirstEnter.end(), control.GetProperty< int >( Actor::Property::ID )));
       mControls.erase(match);
       mPanGestureDetector.Detach(*match);
       mFirstEnter.erase(std::find(mFirstEnter.begin(), mFirstEnter.end(), control.GetProperty< int >( Actor::Property::ID )));
       mControls.erase(match);


@@ -86,7 +86,7 @@ void DragAndDropDetector::DetachAll()
     auto iter = mControls.begin();
     for(;iter != mControls.end();)
     {
     auto iter = mControls.begin();
     for(;iter != mControls.end();)
     {

-      iter->TouchSignal().Disconnect(this, &DragAndDropDetector::OnDrag);
+      iter->TouchedSignal().Disconnect(this, &DragAndDropDetector::OnDrag);

       mPanGestureDetector.Detach(*iter);
       iter = mControls.erase(iter);
     }
       mPanGestureDetector.Detach(*iter);
       iter = mControls.erase(iter);
     }


@@ -123,9 +123,11 @@ void DragAndDropDetector::OnPan(Dali::Actor actor, const PanGesture& gesture)
 {
   Dali::Toolkit::Control control = Dali::Toolkit::Control::DownCast(actor);
 
 {
   Dali::Toolkit::Control control = Dali::Toolkit::Control::DownCast(actor);
 

-  if(gesture.state == Gesture::Started)
+  GestureState state = gesture.GetState();
+
+  if(state == GestureState::STARTED)

   {
   {

-    mDragLocalPosition = gesture.position;
+    mDragLocalPosition = gesture.GetPosition();

     mPointDown = true;
     mDragControl = control;
     mFirstEnter.clear();
     mPointDown = true;
     mDragControl = control;
     mFirstEnter.clear();


@@ -144,23 +146,23 @@ void DragAndDropDetector::OnPan(Dali::Actor actor, const PanGesture& gesture)
     mShadowControl.SetProperty( Actor::Property::PARENT_ORIGIN, control.GetCurrentProperty< Vector3 >( Actor::Property::PARENT_ORIGIN ) );
     mShadowControl.SetProperty( Actor::Property::ANCHOR_POINT,control.GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT ));
     control.GetParent().Add(mShadowControl);
     mShadowControl.SetProperty( Actor::Property::PARENT_ORIGIN, control.GetCurrentProperty< Vector3 >( Actor::Property::PARENT_ORIGIN ) );
     mShadowControl.SetProperty( Actor::Property::ANCHOR_POINT,control.GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT ));
     control.GetParent().Add(mShadowControl);

-    SetPosition(gesture.screenPosition);
+    SetPosition(gesture.GetScreenPosition());

     EmitStartedSignal(control);
   }
     EmitStartedSignal(control);
   }

-  if(gesture.state == Gesture::Continuing)
+  if(state == GestureState::CONTINUING)

   {
   {

-      Vector2 screenPosition = gesture.screenPosition;
+      Vector2 screenPosition = gesture.GetScreenPosition();

       control.GetParent().ScreenToLocal(mLocalPosition.x, mLocalPosition.y, screenPosition.x, screenPosition.y);
       mShadowControl.SetProperty( Actor::Property::POSITION, Vector2(mLocalPosition.x - mDragLocalPosition.x, mLocalPosition.y - mDragLocalPosition.y));
   }
       control.GetParent().ScreenToLocal(mLocalPosition.x, mLocalPosition.y, screenPosition.x, screenPosition.y);
       mShadowControl.SetProperty( Actor::Property::POSITION, Vector2(mLocalPosition.x - mDragLocalPosition.x, mLocalPosition.y - mDragLocalPosition.y));
   }

-  if(gesture.state == Gesture::Finished)
+  if(state == GestureState::FINISHED)

   {
     mDragControl.GetParent().Remove(mShadowControl);
     EmitEndedSignal(control);
   }
 }
 
   {
     mDragControl.GetParent().Remove(mShadowControl);
     EmitEndedSignal(control);
   }
 }
 

-bool DragAndDropDetector::OnDrag(Dali::Actor actor, const Dali::TouchData& data)
+bool DragAndDropDetector::OnDrag(Dali::Actor actor, const Dali::TouchEvent& data)

 {
   Dali::Toolkit::Control control = Dali::Toolkit::Control::DownCast(actor);
   PointState::Type type = data.GetState(0);
 {
   Dali::Toolkit::Control control = Dali::Toolkit::Control::DownCast(actor);
   PointState::Type type = data.GetState(0);