X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fdrag-drop-detector%2Fdrag-and-drop-detector-impl.cpp;h=994932e175d5b8c637863fdfdd7be75dd648d21d;hp=6687e895a87770bd8a561967fb519405368ae883;hb=0e1683ef848d1d877e26633609fa95e0d2ab36b5;hpb=40c53b53859fb3dcdf265728b3f1af673453bbd0 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 6687e89..994932e 100644 --- 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 @@ -123,9 +123,9 @@ void DragAndDropDetector::OnPan(Dali::Actor actor, const PanGesture& gesture) { Dali::Toolkit::Control control = Dali::Toolkit::Control::DownCast(actor); - Gesture::State state = gesture.GetState(); + GestureState state = gesture.GetState(); - if(state == Gesture::Started) + if(state == GestureState::STARTED) { mDragLocalPosition = gesture.GetPosition(); mPointDown = true; @@ -149,13 +149,13 @@ void DragAndDropDetector::OnPan(Dali::Actor actor, const PanGesture& gesture) SetPosition(gesture.GetScreenPosition()); EmitStartedSignal(control); } - if(state == Gesture::Continuing) + if(state == GestureState::CONTINUING) { 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)); } - if(state == Gesture::Finished) + if(state == GestureState::FINISHED) { mDragControl.GetParent().Remove(mShadowControl); EmitEndedSignal(control);