X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.cpp;h=55d18239a846571a86091378c0ca4a84599b8ca9;hb=830f03638ec6ecd3b12ba3d9eb6419fdb3a3db09;hp=080967e5e0d3b7ce2807301d13476016a343f22d;hpb=297b1b9a9b6ed72fe98d5afb018ff4d1c951ce7d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp index 080967e..55d1823 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -25,8 +25,8 @@ #include // INTERNAL INCLUDES -#include -#include +#include +#include using namespace Dali::Toolkit::Text; @@ -320,12 +320,9 @@ void TextField::OnInitialize() mController->EnableTextInput( mDecorator ); // Forward input events to controller - EnableGestureDetection( Gesture::Tap ); - - // TODO - Fix TapGestureDetector to support single and double tap mDoubleTapDetector = TapGestureDetector::New(); - mDoubleTapDetector.SetTapsRequired( 2 ); - mDoubleTapDetector.DetectedSignal().Connect( this, &TextField::OnDoubleTap ); + mDoubleTapDetector.SetMaximumTapsRequired( 2 ); + mDoubleTapDetector.DetectedSignal().Connect( this, &TextField::OnTap ); mDoubleTapDetector.Attach(Self()); // Set BoundingBox to stage size if not already set. @@ -372,14 +369,9 @@ void TextField::OnRelayout( const Vector2& size, ActorSizeContainer& container ) } } -void TextField::OnTap( const TapGesture& tap ) -{ - mController->TapEvent( tap.numberOfTaps, tap.localPoint.x, tap.localPoint.y ); -} - -void TextField::OnDoubleTap( Actor actor, const TapGesture& tap ) +void TextField::OnTap( Actor actor, const TapGesture& gesture ) { - mController->TapEvent( tap.numberOfTaps, tap.localPoint.x, tap.localPoint.y ); + mController->TapEvent( gesture.numberOfTaps, gesture.localPoint.x, gesture.localPoint.y ); } void TextField::RequestTextRelayout()