X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fevents%2Ftap-gesture%2Ftap-gesture-recognizer.cpp;h=5daa963cded4ab768ea5e1d3e4288211487d3556;hb=34745e42eed50817085b2e4868d301f8d43f9003;hp=9170dea5e2763a5b6c996eb1fd281e5ba5433fa4;hpb=894cc6056a3be0b9f478504524a54aca151ccffb;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.cpp b/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.cpp
index 9170dea..5daa963 100644
--- a/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.cpp
+++ b/dali/internal/event/events/tap-gesture/tap-gesture-recognizer.cpp
@@ -43,9 +43,9 @@ const unsigned long MAXIMUM_TIME_ALLOWED = 500u;
 } // unnamed namespace
 
 TapGestureRecognizer::TapGestureRecognizer( Observer& observer, Vector2 screenSize, const TapGestureRequest& request)
-: GestureRecognizer( screenSize, Dali::Gesture::Tap ),
+: GestureRecognizer( screenSize, GestureType::TAP ),
   mObserver(observer),
-  mState(Clear),
+  mState(CLEAR),
   mMinimumTapsRequired(request.minTaps),
   mMaximumTapsRequired(request.maxTaps),
   mTapsRegistered(0),
@@ -70,7 +70,7 @@ void TapGestureRecognizer::SendEvent(const Integration::TouchEvent& event)
 
     switch (mState)
     {
-      case Clear:
+      case CLEAR:
       {
         if (pointState == PointState::DOWN)
         {
@@ -79,7 +79,7 @@ void TapGestureRecognizer::SendEvent(const Integration::TouchEvent& event)
         break;
       }
 
-      case Touched:
+      case TOUCHED:
       {
         uint32_t deltaBetweenTouchDownTouchUp = event.time - mTouchTime;
 
@@ -89,21 +89,21 @@ void TapGestureRecognizer::SendEvent(const Integration::TouchEvent& event)
           {
             mLastTapTime = mTouchTime;
             EmitSingleTap( event.time, point );
-            mState = Registered;
+            mState = REGISTERED;
           }
           else
           {
-            mState = Clear;
+            mState = CLEAR;
           }
         }
         else if (pointState == PointState::INTERRUPTED)
         {
-          mState = Clear;
+          mState = CLEAR;
         }
         break;
       }
 
-      case Registered:
+      case REGISTERED:
       {
         if ( pointState == PointState::UP )
         {
@@ -117,18 +117,18 @@ void TapGestureRecognizer::SendEvent(const Integration::TouchEvent& event)
             {
               mLastTapTime = event.time;
               EmitSingleTap(event.time, point);
-              mState = Registered;
+              mState = REGISTERED;
             }
             else
             {
               ++mTapsRegistered;
-              EmitGesture( Dali::Gesture::Started, event.time );
-              mState = Clear;
+              EmitGesture( GestureState::STARTED, event.time );
+              mState = CLEAR;
             }
           }
-          else // Delta between touch down and touch up too long to be considered a Tap event
+          else // Delta between touch down and touch up too long to be considered a TAP event
           {
-            mState = Clear;
+            mState = CLEAR;
           }
         }
         else if (pointState == PointState::DOWN)
@@ -153,20 +153,20 @@ void TapGestureRecognizer::SendEvent(const Integration::TouchEvent& event)
         break;
       }
 
-      case Failed:
+      case FAILED:
       default:
       {
-        mState = Clear;
+        mState = CLEAR;
         break;
       }
     }
   }
   else
   {
-    mState = Failed;
+    mState = FAILED;
 
     // We have entered a multi-touch event so emit registered gestures if required.
-    EmitGesture(Dali::Gesture::Started, event.time);
+    EmitGesture(GestureState::STARTED, event.time);
   }
 }
 
@@ -176,13 +176,13 @@ void TapGestureRecognizer::SetupForTouchDown( const Integration::TouchEvent& eve
   mTouchTime = event.time;
   mLastTapTime = 0u;
   mTapsRegistered = 0;
-  mState = Touched;
+  mState = TOUCHED;
   EmitPossibleState( event );
 }
 
 void TapGestureRecognizer::EmitPossibleState( const Integration::TouchEvent& event )
 {
-  TapGestureEvent tapEvent( Dali::Gesture::Possible );
+  TapGestureEvent tapEvent( GestureState::POSSIBLE );
   tapEvent.point = mTouchPosition;
   tapEvent.time = event.time;
 
@@ -198,9 +198,9 @@ void TapGestureRecognizer::Update(const GestureRequest& request)
   mMaximumTapsRequired = tap.maxTaps;
 }
 
-void TapGestureRecognizer::EmitGesture( Gesture::State state, uint32_t time )
+void TapGestureRecognizer::EmitGesture( GestureState state, uint32_t time )
 {
-  if ( (state == Dali::Gesture::Cancelled) ||
+  if ( (state == GestureState::CANCELLED) ||
        (mTapsRegistered >= mMinimumTapsRequired && mTapsRegistered <= mMaximumTapsRequired) )
 
   {
@@ -211,7 +211,7 @@ void TapGestureRecognizer::EmitGesture( Gesture::State state, uint32_t time )
 
 void TapGestureRecognizer::EmitSingleTap( uint32_t time, const Integration::Point& point )
 {
-  TapGestureEvent event( Dali::Gesture::Started );
+  TapGestureEvent event( GestureState::STARTED );
   const Vector2& screen( point.GetScreenPosition() );
   Vector2 distanceDelta(std::abs(mTouchPosition.x - screen.x),
                         std::abs(mTouchPosition.y - screen.y));
@@ -219,7 +219,7 @@ void TapGestureRecognizer::EmitSingleTap( uint32_t time, const Integration::Poin
   if (distanceDelta.x > MAXIMUM_MOTION_ALLOWED ||
       distanceDelta.y > MAXIMUM_MOTION_ALLOWED )
   {
-    event.state = Dali::Gesture::Cancelled;
+    event.state = GestureState::CANCELLED;
   }
   mTapsRegistered = 1u;
   EmitTap( time, event );