X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.cpp;h=4abf4c3f92d86434af12ddce36be1d4d2e08d185;hb=761122f3e8ff2b224d2329a911a78dc35177c5ea;hp=8f1b4345c7e9af3741d097d5d5d08ffea09cc994;hpb=dda9d7ca30d6f5c42759647df03a13e52c76228a;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 8f1b434..4abf4c3 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -1120,7 +1120,7 @@ void TextField::OnInitialize() EnableGestureDetection( static_cast( Gesture::Tap | Gesture::Pan | Gesture::LongPress ) ); GetTapGestureDetector().SetMaximumTapsRequired( 2 ); - self.TouchedSignal().Connect( this, &TextField::OnTouched ); + self.TouchSignal().Connect( this, &TextField::OnTouched ); // Set BoundingBox to stage size if not already set. Rect boundingBox; @@ -1453,7 +1453,7 @@ void TextField::EnableClipping( bool clipping, const Vector2& size ) mClipper = Clipper::New( size ); self.Add( mClipper->GetRootActor() ); - self.Add( mClipper->GetImageActor() ); + self.Add( mClipper->GetImageView() ); } else if ( mClipper ) { @@ -1463,7 +1463,7 @@ void TextField::EnableClipping( bool clipping, const Vector2& size ) } else { - // Note - this will automatically remove the root & image actors + // Note - this will automatically remove the root actor & the image view mClipper.Reset(); } } @@ -1499,7 +1499,7 @@ void TextField::OnStageConnection( int depth ) // The depth of the text renderer is set in the RenderText() called from OnRelayout(). } -bool TextField::OnTouched( Actor actor, const TouchEvent& event ) +bool TextField::OnTouched( Actor actor, const TouchData& touch ) { return true; }