} // 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),
switch (mState)
{
- case Clear:
+ case CLEAR:
{
if (pointState == PointState::DOWN)
{
break;
}
- case Touched:
+ case TOUCHED:
{
uint32_t deltaBetweenTouchDownTouchUp = event.time - mTouchTime;
{
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 )
{
{
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)
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);
}
}
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;
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) )
{
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));
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 );