X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.cpp;h=bfa89f632cb3dc6f4868efc95046398c75dd6725;hb=refs%2Fchanges%2F08%2F36608%2F17;hp=03dcf4480eae968c3128079bf7bda3b3fdd667be;hpb=9f1abc9d8b332a4a619173082cc2622f3c4c6125;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 03dcf44..bfa89f6 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -19,14 +19,17 @@ #include // EXTERNAL INCLUDES +#include +#include +#include #include #include -#include +#include #include // INTERNAL INCLUDES -#include -#include +#include +#include using namespace Dali::Toolkit::Text; @@ -44,18 +47,6 @@ namespace Dali namespace Toolkit { -const Property::Index TextField::PROPERTY_RENDERING_BACKEND( Internal::TextField::TEXTFIELD_PROPERTY_START_INDEX ); -const Property::Index TextField::PROPERTY_PLACEHOLDER_TEXT( Internal::TextField::TEXTFIELD_PROPERTY_START_INDEX + 1 ); -const Property::Index TextField::PROPERTY_TEXT( Internal::TextField::TEXTFIELD_PROPERTY_START_INDEX + 2 ); -const Property::Index TextField::PROPERTY_CURSOR_IMAGE( Internal::TextField::TEXTFIELD_PROPERTY_START_INDEX + 3 ); -const Property::Index TextField::PROPERTY_PRIMARY_CURSOR_COLOR( Internal::TextField::TEXTFIELD_PROPERTY_START_INDEX + 4 ); -const Property::Index TextField::PROPERTY_SECONDARY_CURSOR_COLOR( Internal::TextField::TEXTFIELD_PROPERTY_START_INDEX + 5 ); -const Property::Index TextField::PROPERTY_ENABLE_CURSOR_BLINK( Internal::TextField::TEXTFIELD_PROPERTY_START_INDEX + 6 ); -const Property::Index TextField::PROPERTY_CURSOR_BLINK_INTERVAL( Internal::TextField::TEXTFIELD_PROPERTY_START_INDEX + 7 ); -const Property::Index TextField::PROPERTY_CURSOR_BLINK_DURATION( Internal::TextField::TEXTFIELD_PROPERTY_START_INDEX + 8 ); -const Property::Index TextField::PROPERTY_GRAB_HANDLE_IMAGE( Internal::TextField::TEXTFIELD_PROPERTY_START_INDEX + 9 ); -const Property::Index TextField::PROPERTY_DECORATION_BOUNDING_BOX( Internal::TextField::TEXTFIELD_PROPERTY_START_INDEX + 10 ); - namespace Internal { @@ -68,19 +59,27 @@ BaseHandle Create() return Toolkit::TextField::New(); } -TypeRegistration mType( typeid(Toolkit::TextField), typeid(Toolkit::Control), Create ); - -PropertyRegistration property01( mType, "rendering-backend", Toolkit::TextField::PROPERTY_RENDERING_BACKEND, Property::INTEGER, &TextField::SetProperty, &TextField::GetProperty ); -PropertyRegistration property02( mType, "placeholder-text", Toolkit::TextField::PROPERTY_PLACEHOLDER_TEXT, Property::STRING, &TextField::SetProperty, &TextField::GetProperty ); -PropertyRegistration property03( mType, "text", Toolkit::TextField::PROPERTY_TEXT, Property::STRING, &TextField::SetProperty, &TextField::GetProperty ); -PropertyRegistration property04( mType, "cursor-image", Toolkit::TextField::PROPERTY_CURSOR_IMAGE, Property::STRING, &TextField::SetProperty, &TextField::GetProperty ); -PropertyRegistration property05( mType, "primary-cursor-color", Toolkit::TextField::PROPERTY_PRIMARY_CURSOR_COLOR, Property::VECTOR4, &TextField::SetProperty, &TextField::GetProperty ); -PropertyRegistration property06( mType, "secondary-cursor-color", Toolkit::TextField::PROPERTY_SECONDARY_CURSOR_COLOR, Property::VECTOR4, &TextField::SetProperty, &TextField::GetProperty ); -PropertyRegistration property07( mType, "enable-cursor-blink", Toolkit::TextField::PROPERTY_ENABLE_CURSOR_BLINK, Property::BOOLEAN, &TextField::SetProperty, &TextField::GetProperty ); -PropertyRegistration property08( mType, "cursor-blink-interval", Toolkit::TextField::PROPERTY_CURSOR_BLINK_INTERVAL, Property::FLOAT, &TextField::SetProperty, &TextField::GetProperty ); -PropertyRegistration property09( mType, "cursor-blink-duration", Toolkit::TextField::PROPERTY_CURSOR_BLINK_DURATION, Property::FLOAT, &TextField::SetProperty, &TextField::GetProperty ); -PropertyRegistration property10( mType, "grab-handle-image", Toolkit::TextField::PROPERTY_GRAB_HANDLE_IMAGE, Property::STRING, &TextField::SetProperty, &TextField::GetProperty ); -PropertyRegistration property11( mType, "decoration bounding-box", Toolkit::TextField::PROPERTY_DECORATION_BOUNDING_BOX, Property::RECTANGLE, &TextField::SetProperty, &TextField::GetProperty ); +// Setup properties, signals and actions using the type-registry. +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::TextField, Toolkit::Control, Create ); + +DALI_PROPERTY_REGISTRATION( TextField, "rendering-backend", INTEGER, RENDERING_BACKEND ) +DALI_PROPERTY_REGISTRATION( TextField, "placeholder-text", STRING, PLACEHOLDER_TEXT ) +DALI_PROPERTY_REGISTRATION( TextField, "text", STRING, TEXT ) +DALI_PROPERTY_REGISTRATION( TextField, "font-family", STRING, FONT_FAMILY ) +DALI_PROPERTY_REGISTRATION( TextField, "font-style", STRING, FONT_STYLE ) +DALI_PROPERTY_REGISTRATION( TextField, "point-size", FLOAT, POINT_SIZE ) +DALI_PROPERTY_REGISTRATION( TextField, "exceed-policy", INTEGER, EXCEED_POLICY ) +DALI_PROPERTY_REGISTRATION( TextField, "cursor-image", STRING, CURSOR_IMAGE ) +DALI_PROPERTY_REGISTRATION( TextField, "primary-cursor-color", VECTOR4, PRIMARY_CURSOR_COLOR ) +DALI_PROPERTY_REGISTRATION( TextField, "secondary-cursor-color", VECTOR4, SECONDARY_CURSOR_COLOR ) +DALI_PROPERTY_REGISTRATION( TextField, "enable-cursor-blink", BOOLEAN, ENABLE_CURSOR_BLINK ) +DALI_PROPERTY_REGISTRATION( TextField, "cursor-blink-interval", FLOAT, CURSOR_BLINK_INTERVAL ) +DALI_PROPERTY_REGISTRATION( TextField, "cursor-blink-duration", FLOAT, CURSOR_BLINK_DURATION ) +DALI_PROPERTY_REGISTRATION( TextField, "grab-handle-image", STRING, GRAB_HANDLE_IMAGE ) +DALI_PROPERTY_REGISTRATION( TextField, "decoration bounding-box", RECTANGLE, DECORATION_BOUNDING_BOX ) + +DALI_TYPE_REGISTRATION_END() + } // namespace Toolkit::TextField TextField::New() @@ -108,9 +107,9 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr switch( index ) { - case Toolkit::TextField::PROPERTY_RENDERING_BACKEND: + case Toolkit::TextField::Property::RENDERING_BACKEND: { - unsigned int backend = value.Get< unsigned int >(); + int backend = value.Get< int >(); if( impl.mRenderingBackend != backend ) { @@ -119,7 +118,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::TextField::PROPERTY_PLACEHOLDER_TEXT: + case Toolkit::TextField::Property::PLACEHOLDER_TEXT: { if( impl.mController ) { @@ -127,7 +126,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::TextField::PROPERTY_TEXT: + case Toolkit::TextField::Property::TEXT: { if( impl.mController ) { @@ -135,7 +134,54 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::TextField::PROPERTY_CURSOR_IMAGE: + case Toolkit::TextField::Property::FONT_FAMILY: + { + if( impl.mController ) + { + std::string fontFamily = value.Get< std::string >(); + + if( impl.mController->GetDefaultFontFamily() != fontFamily ) + { + impl.mController->SetDefaultFontFamily( fontFamily ); + impl.RequestTextRelayout(); + } + } + break; + } + case Toolkit::TextField::Property::FONT_STYLE: + { + if( impl.mController ) + { + std::string fontStyle = value.Get< std::string >(); + + if( impl.mController->GetDefaultFontStyle() != fontStyle ) + { + impl.mController->SetDefaultFontStyle( fontStyle ); + impl.RequestTextRelayout(); + } + } + break; + } + case Toolkit::TextField::Property::POINT_SIZE: + { + if( impl.mController ) + { + float pointSize = value.Get< float >(); + + if( impl.mController->GetDefaultPointSize() != pointSize /*TODO - epsilon*/ ) + { + impl.mController->SetDefaultPointSize( pointSize ); + impl.RequestTextRelayout(); + } + } + break; + } + case Toolkit::TextField::Property::EXCEED_POLICY: + { + impl.mExceedPolicy = value.Get< int >(); + break; + } + case Toolkit::TextField::Property::CURSOR_IMAGE: { ResourceImage image = ResourceImage::New( value.Get< std::string >() ); @@ -145,7 +191,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::TextField::PROPERTY_PRIMARY_CURSOR_COLOR: + case Toolkit::TextField::Property::PRIMARY_CURSOR_COLOR: { if( impl.mDecorator ) { @@ -153,7 +199,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::TextField::PROPERTY_SECONDARY_CURSOR_COLOR: + case Toolkit::TextField::Property::SECONDARY_CURSOR_COLOR: { if( impl.mDecorator ) { @@ -161,7 +207,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::TextField::PROPERTY_ENABLE_CURSOR_BLINK: + case Toolkit::TextField::Property::ENABLE_CURSOR_BLINK: { if( impl.mController ) { @@ -169,7 +215,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::TextField::PROPERTY_CURSOR_BLINK_INTERVAL: + case Toolkit::TextField::Property::CURSOR_BLINK_INTERVAL: { if( impl.mDecorator ) { @@ -177,7 +223,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::TextField::PROPERTY_CURSOR_BLINK_DURATION: + case Toolkit::TextField::Property::CURSOR_BLINK_DURATION: { if( impl.mDecorator ) { @@ -185,7 +231,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::TextField::PROPERTY_GRAB_HANDLE_IMAGE: + case Toolkit::TextField::Property::GRAB_HANDLE_IMAGE: { ResourceImage image = ResourceImage::New( value.Get< std::string >() ); @@ -195,7 +241,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::TextField::PROPERTY_DECORATION_BOUNDING_BOX: + case Toolkit::TextField::Property::DECORATION_BOUNDING_BOX: { if( impl.mDecorator ) { @@ -219,22 +265,37 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde switch( index ) { - case Toolkit::TextField::PROPERTY_RENDERING_BACKEND: + case Toolkit::TextField::Property::RENDERING_BACKEND: { value = impl.mRenderingBackend; break; } - case Toolkit::TextField::PROPERTY_PLACEHOLDER_TEXT: + case Toolkit::TextField::Property::PLACEHOLDER_TEXT: + { + if( impl.mController ) + { + std::string text; + impl.mController->GetPlaceholderText( text ); + value = text; + } + break; + } + case Toolkit::TextField::Property::TEXT: { - DALI_LOG_WARNING( "UTF-8 text representation was discarded\n" ); + if( impl.mController ) + { + std::string text; + impl.mController->GetText( text ); + value = text; + } break; } - case Toolkit::TextField::PROPERTY_TEXT: + case Toolkit::TextField::Property::EXCEED_POLICY: { - DALI_LOG_WARNING( "UTF-8 text representation was discarded\n" ); + value = impl.mExceedPolicy; break; } - case Toolkit::TextField::PROPERTY_CURSOR_IMAGE: + case Toolkit::TextField::Property::CURSOR_IMAGE: { if( impl.mDecorator ) { @@ -246,7 +307,7 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } break; } - case Toolkit::TextField::PROPERTY_PRIMARY_CURSOR_COLOR: + case Toolkit::TextField::Property::PRIMARY_CURSOR_COLOR: { if( impl.mDecorator ) { @@ -254,7 +315,7 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } break; } - case Toolkit::TextField::PROPERTY_SECONDARY_CURSOR_COLOR: + case Toolkit::TextField::Property::SECONDARY_CURSOR_COLOR: { if( impl.mDecorator ) { @@ -262,12 +323,12 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } break; } - case Toolkit::TextField::PROPERTY_ENABLE_CURSOR_BLINK: + case Toolkit::TextField::Property::ENABLE_CURSOR_BLINK: { //value = impl.mController->GetEnableCursorBlink(); TODO break; } - case Toolkit::TextField::PROPERTY_CURSOR_BLINK_INTERVAL: + case Toolkit::TextField::Property::CURSOR_BLINK_INTERVAL: { if( impl.mDecorator ) { @@ -275,7 +336,7 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } break; } - case Toolkit::TextField::PROPERTY_CURSOR_BLINK_DURATION: + case Toolkit::TextField::Property::CURSOR_BLINK_DURATION: { if( impl.mDecorator ) { @@ -283,7 +344,7 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } break; } - case Toolkit::TextField::PROPERTY_GRAB_HANDLE_IMAGE: + case Toolkit::TextField::Property::GRAB_HANDLE_IMAGE: { if( impl.mDecorator ) { @@ -295,7 +356,7 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde } break; } - case Toolkit::TextField::PROPERTY_DECORATION_BOUNDING_BOX: + case Toolkit::TextField::Property::DECORATION_BOUNDING_BOX: { if( impl.mDecorator ) { @@ -320,13 +381,8 @@ 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.Attach(Self()); + EnableGestureDetection(Gesture::Tap); + GetTapGestureDetector().SetMaximumTapsRequired( 2 ); // Set BoundingBox to stage size if not already set. if ( mDecorator->GetBoundingBox().IsEmpty() ) @@ -336,9 +392,20 @@ void TextField::OnInitialize() } } +Vector3 TextField::GetNaturalSize() +{ + return mController->GetNaturalSize(); +} + +float TextField::GetHeightForWidth( float width ) +{ + return mController->GetHeightForWidth( width ); +} + void TextField::OnRelayout( const Vector2& size, ActorSizeContainer& container ) { - if( mController->Relayout( size ) ) + if( mController->Relayout( size ) || + !mRenderer ) { if( mDecorator ) { @@ -350,26 +417,50 @@ void TextField::OnRelayout( const Vector2& size, ActorSizeContainer& container ) mRenderer = Backend::Get().NewRenderer( mRenderingBackend ); } + RenderableActor renderableActor; if( mRenderer ) { - Actor renderableActor = mRenderer->Render( mController->GetView() ); + renderableActor = mRenderer->Render( mController->GetView() ); + } - if( renderableActor ) + EnableClipping( (Dali::Toolkit::TextField::EXCEED_POLICY_CLIP == mExceedPolicy), size ); + + if( renderableActor != mRenderableActor ) + { + UnparentAndReset( mRenderableActor ); + mRenderableActor = renderableActor; + } + + if( mRenderableActor ) + { + // Make sure the actor is parented correctly with/without clipping + if( mClipper ) + { + mClipper->GetRootActor().Add( mRenderableActor ); + } + else { - Self().Add( renderableActor ); + Self().Add( mRenderableActor ); } } } } -void TextField::OnTap( const TapGesture& tap ) +void TextField::OnTap( const TapGesture& gesture ) { - mController->TapEvent( tap.numberOfTaps, tap.localPoint.x, tap.localPoint.y ); + SetKeyInputFocus(); + + mController->TapEvent( gesture.numberOfTaps, gesture.localPoint.x, gesture.localPoint.y ); } -void TextField::OnDoubleTap( Actor actor, const TapGesture& tap ) +bool TextField::OnKeyEvent( const KeyEvent& event ) { - mController->TapEvent( tap.numberOfTaps, tap.localPoint.x, tap.localPoint.y ); + if( Dali::DALI_KEY_ESCAPE == event.keyCode ) + { + ClearKeyInputFocus(); + } + + return mController->KeyEvent( event ); } void TextField::RequestTextRelayout() @@ -377,14 +468,44 @@ void TextField::RequestTextRelayout() RelayoutRequest(); } +void TextField::EnableClipping( bool clipping, const Vector2& size ) +{ + if( clipping ) + { + // Not worth to created clip actor if width or height is equal to zero. + if( size.width > Math::MACHINE_EPSILON_1000 && size.height > Math::MACHINE_EPSILON_1000 ) + { + if( !mClipper ) + { + Actor self = Self(); + + mClipper = Clipper::New( size ); + self.Add( mClipper->GetRootActor() ); + self.Add( mClipper->GetImageActor() ); + } + else if ( mClipper ) + { + mClipper->Refresh( size ); + } + } + } + else + { + // Note - this will automatically remove the root & image actors + mClipper.Reset(); + } +} + TextField::TextField() : Control( ControlBehaviour( CONTROL_BEHAVIOUR_NONE ) ), - mRenderingBackend( DEFAULT_RENDERING_BACKEND ) + mRenderingBackend( DEFAULT_RENDERING_BACKEND ), + mExceedPolicy( Dali::Toolkit::TextField::EXCEED_POLICY_CLIP ) { } TextField::~TextField() { + mClipper.Reset(); } } // namespace Internal