X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-field-impl.cpp;h=d687d51b7bffcd639a60748036a6d9334b90fe68;hp=03dcf4480eae968c3128079bf7bda3b3fdd667be;hb=f384d637fc0bfd41b4b93221f246719904501c57;hpb=1b2bbfd393cdd9008d15304278bc70e5d0ab5764 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..d687d51 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,16 @@ #include // EXTERNAL INCLUDES +#include #include #include +#include #include #include // INTERNAL INCLUDES -#include -#include +#include +#include using namespace Dali::Toolkit::Text; @@ -44,18 +46,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 +58,26 @@ 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, "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,7 +105,7 @@ 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 >(); @@ -119,7 +116,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 +124,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 +132,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr } break; } - case Toolkit::TextField::PROPERTY_CURSOR_IMAGE: + case Toolkit::TextField::Property::CURSOR_IMAGE: { ResourceImage image = ResourceImage::New( value.Get< std::string >() ); @@ -145,7 +142,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 +150,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 +158,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 +166,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 +174,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 +182,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 +192,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 +216,32 @@ 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: { - DALI_LOG_WARNING( "UTF-8 text representation was discarded\n" ); + if( impl.mController ) + { + std::string text; + impl.mController->GetPlaceholderText( text ); + value = text; + } break; } - case Toolkit::TextField::PROPERTY_TEXT: + 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_CURSOR_IMAGE: + case Toolkit::TextField::Property::CURSOR_IMAGE: { if( impl.mDecorator ) { @@ -246,7 +253,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 +261,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 +269,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 +282,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 +290,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 +302,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 +327,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,6 +338,16 @@ 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 ) ) @@ -362,14 +374,21 @@ void TextField::OnRelayout( const Vector2& size, ActorSizeContainer& container ) } } -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()