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=728a3be2a3a9d668e59596baf8bc938f7518626a;hp=11ec5c21918b82c06e8ee710aacf6f75573ce51a;hb=5b3cf0e6742934674bdf62bbe15af00e39eae566;hpb=eff9a302f2e5999932743f5d5341e315f627793e 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 11ec5c2..728a3be 100644 --- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include using namespace Dali::Toolkit::Text; @@ -62,7 +63,7 @@ namespace // unnamed namespace namespace { -const Scripting::StringEnum< Toolkit::Text::LayoutEngine::HorizontalAlignment > HORIZONTAL_ALIGNMENT_STRING_TABLE[] = +const Scripting::StringEnum HORIZONTAL_ALIGNMENT_STRING_TABLE[] = { { "BEGIN", Toolkit::Text::LayoutEngine::HORIZONTAL_ALIGN_BEGIN }, { "CENTER", Toolkit::Text::LayoutEngine::HORIZONTAL_ALIGN_CENTER }, @@ -70,7 +71,7 @@ const Scripting::StringEnum< Toolkit::Text::LayoutEngine::HorizontalAlignment > }; const unsigned int HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT = sizeof( HORIZONTAL_ALIGNMENT_STRING_TABLE ) / sizeof( HORIZONTAL_ALIGNMENT_STRING_TABLE[0] ); -const Scripting::StringEnum< Toolkit::Text::LayoutEngine::VerticalAlignment > VERTICAL_ALIGNMENT_STRING_TABLE[] = +const Scripting::StringEnum VERTICAL_ALIGNMENT_STRING_TABLE[] = { { "TOP", Toolkit::Text::LayoutEngine::VERTICAL_ALIGN_TOP }, { "CENTER", Toolkit::Text::LayoutEngine::VERTICAL_ALIGN_CENTER }, @@ -108,17 +109,18 @@ DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "enable-cursor-blink", DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "cursor-blink-interval", FLOAT, CURSOR_BLINK_INTERVAL ) DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "cursor-blink-duration", FLOAT, CURSOR_BLINK_DURATION ) DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "grab-handle-image", STRING, GRAB_HANDLE_IMAGE ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "grab-handle-pressed-image", VECTOR4, GRAB_HANDLE_PRESSED_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "grab-handle-pressed-image", STRING, GRAB_HANDLE_PRESSED_IMAGE ) DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "scroll-threshold", FLOAT, SCROLL_THRESHOLD ) DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "scroll-speed", FLOAT, SCROLL_SPEED ) DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selection-handle-image-left", STRING, SELECTION_HANDLE_IMAGE_LEFT ) DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selection-handle-image-right", STRING, SELECTION_HANDLE_IMAGE_RIGHT ) DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selection-handle-pressed-image-left", STRING, SELECTION_HANDLE_PRESSED_IMAGE_LEFT ) DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selection-handle-pressed-image-right", STRING, SELECTION_HANDLE_PRESSED_IMAGE_RIGHT ) -DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selection-highlight-color", STRING, SELECTION_HIGHLIGHT_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "selection-highlight-color", VECTOR4, SELECTION_HIGHLIGHT_COLOR ) DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "decoration-bounding-box", RECTANGLE, DECORATION_BOUNDING_BOX ) DALI_PROPERTY_REGISTRATION( Toolkit, TextField, "input-method-settings", MAP, INPUT_METHOD_SETTINGS ) +DALI_SIGNAL_REGISTRATION( Toolkit, TextField, "text-changed", SIGNAL_TEXT_CHANGED ) DALI_SIGNAL_REGISTRATION( Toolkit, TextField, "max-length-reached", SIGNAL_MAX_LENGTH_REACHED ) DALI_TYPE_REGISTRATION_END() @@ -250,11 +252,14 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr const std::string alignStr = value.Get< std::string >(); DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p HORIZONTAL_ALIGNMENT %f\n", impl.mController.Get(), alignStr.c_str() ); - const LayoutEngine::HorizontalAlignment alignment = Scripting::GetEnumeration< LayoutEngine::HorizontalAlignment >( alignStr.c_str(), - HORIZONTAL_ALIGNMENT_STRING_TABLE, - HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT ); - - impl.mController->SetHorizontalAlignment( alignment ); + LayoutEngine::HorizontalAlignment alignment( LayoutEngine::HORIZONTAL_ALIGN_BEGIN ); + if( Scripting::GetEnumeration< LayoutEngine::HorizontalAlignment >( alignStr.c_str(), + HORIZONTAL_ALIGNMENT_STRING_TABLE, + HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT, + alignment ) ) + { + impl.mController->SetHorizontalAlignment( alignment ); + } } break; } @@ -265,11 +270,14 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr const std::string alignStr = value.Get< std::string >(); DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p VERTICAL_ALIGNMENT %f\n", impl.mController.Get(), alignStr.c_str() ); - LayoutEngine::VerticalAlignment alignment = Scripting::GetEnumeration< LayoutEngine::VerticalAlignment >( alignStr.c_str(), - VERTICAL_ALIGNMENT_STRING_TABLE, - VERTICAL_ALIGNMENT_STRING_TABLE_COUNT ); - - impl.mController->SetVerticalAlignment( alignment ); + LayoutEngine::VerticalAlignment alignment( LayoutEngine::VERTICAL_ALIGN_BOTTOM ); + if( Scripting::GetEnumeration< LayoutEngine::VerticalAlignment >( alignStr.c_str(), + VERTICAL_ALIGNMENT_STRING_TABLE, + VERTICAL_ALIGNMENT_STRING_TABLE_COUNT, + alignment ) ) + { + impl.mController->SetVerticalAlignment( alignment ); + } } break; } @@ -340,7 +348,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr const Vector4 color = value.Get< Vector4 >(); DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p PRIMARY_CURSOR_COLOR %f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a ); - impl.mDecorator->SetColor( PRIMARY_CURSOR, color ); + impl.mDecorator->SetCursorColor( PRIMARY_CURSOR, color ); impl.RequestTextRelayout(); } break; @@ -352,7 +360,7 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr const Vector4 color = value.Get< Vector4 >(); DALI_LOG_INFO( gLogFilter, Debug::General, "TextField %p SECONDARY_CURSOR_COLOR %f,%f\n", impl.mController.Get(), color.r, color.g, color.b, color.a ); - impl.mDecorator->SetColor( SECONDARY_CURSOR, color ); + impl.mDecorator->SetCursorColor( SECONDARY_CURSOR, color ); impl.RequestTextRelayout(); } break; @@ -611,9 +619,13 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde { if( impl.mController ) { - value = std::string( Scripting::GetEnumerationName< Toolkit::Text::LayoutEngine::HorizontalAlignment >( impl.mController->GetLayoutEngine().GetHorizontalAlignment(), - HORIZONTAL_ALIGNMENT_STRING_TABLE, - HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT ) ); + const char* name = Scripting::GetEnumerationName< Toolkit::Text::LayoutEngine::HorizontalAlignment >( impl.mController->GetLayoutEngine().GetHorizontalAlignment(), + HORIZONTAL_ALIGNMENT_STRING_TABLE, + HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT ); + if( name ) + { + value = std::string( name ); + } } break; } @@ -621,9 +633,13 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde { if( impl.mController ) { - value = std::string( Scripting::GetEnumerationName< Toolkit::Text::LayoutEngine::VerticalAlignment >( impl.mController->GetLayoutEngine().GetVerticalAlignment(), - VERTICAL_ALIGNMENT_STRING_TABLE, - VERTICAL_ALIGNMENT_STRING_TABLE_COUNT ) ); + const char* name = Scripting::GetEnumerationName< Toolkit::Text::LayoutEngine::VerticalAlignment >( impl.mController->GetLayoutEngine().GetVerticalAlignment(), + VERTICAL_ALIGNMENT_STRING_TABLE, + VERTICAL_ALIGNMENT_STRING_TABLE_COUNT ); + if( name ) + { + value = std::string( name ); + } } break; } @@ -825,7 +841,11 @@ bool TextField::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* bool connected( true ); Toolkit::TextField field = Toolkit::TextField::DownCast( handle ); - if( 0 == strcmp( signalName.c_str(), SIGNAL_MAX_LENGTH_REACHED ) ) + if( 0 == strcmp( signalName.c_str(), SIGNAL_TEXT_CHANGED ) ) + { + field.TextChangedSignal().Connect( tracker, functor ); + } + else if( 0 == strcmp( signalName.c_str(), SIGNAL_MAX_LENGTH_REACHED ) ) { field.MaxLengthReachedSignal().Connect( tracker, functor ); } @@ -838,6 +858,11 @@ bool TextField::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* return connected; } +Toolkit::TextField::TextChangedSignalType& TextField::TextChangedSignal() +{ + return mTextChangedSignal; +} + Toolkit::TextField::MaxLengthReachedSignalType& TextField::MaxLengthReachedSignal() { return mMaxLengthReachedSignal; @@ -849,16 +874,16 @@ void TextField::OnInitialize() mController = Text::Controller::New( *this ); - mDecorator = Text::Decorator::New( *this, *mController ); + mDecorator = Text::Decorator::New( *mController, + *mController ); mController->GetLayoutEngine().SetLayout( LayoutEngine::SINGLE_LINE_BOX ); mController->EnableTextInput( mDecorator ); // Forward input events to controller - EnableGestureDetection(Gesture::Tap); + EnableGestureDetection( static_cast( Gesture::Tap | Gesture::Pan |Gesture::LongPress ) ); GetTapGestureDetector().SetMaximumTapsRequired( 2 ); - EnableGestureDetection(Gesture::Pan); self.TouchedSignal().Connect( this, &TextField::OnTouched ); @@ -872,6 +897,7 @@ void TextField::OnInitialize() // Fill-parent area by default self.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); self.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT ); + self.OnStageSignal().Connect( this, &TextField::OnStageConnect ); } void TextField::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) @@ -906,36 +932,65 @@ void TextField::OnRelayout( const Vector2& size, RelayoutContainer& container ) mRenderer = Backend::Get().NewRenderer( mRenderingBackend ); } - RenderableActor renderableActor; - if( mRenderer ) - { - renderableActor = mRenderer->Render( mController->GetView() ); - } - EnableClipping( (Dali::Toolkit::TextField::EXCEED_POLICY_CLIP == mExceedPolicy), size ); + RenderText(); + } +} + +void TextField::RenderText() +{ + Actor self = Self(); + Actor renderableActor; + if( mRenderer ) + { + renderableActor = mRenderer->Render( mController->GetView(), self.GetHierarchyDepth() ); + } - if( renderableActor != mRenderableActor ) + if( renderableActor != mRenderableActor ) + { + UnparentAndReset( mRenderableActor ); + mRenderableActor = renderableActor; + } + + if( mRenderableActor ) + { + const Vector2 offset = mController->GetScrollPosition() + mController->GetAlignmentOffset(); + + mRenderableActor.SetPosition( offset.x, offset.y ); + + Actor clipRootActor; + if( mClipper ) { - UnparentAndReset( mRenderableActor ); - mRenderableActor = renderableActor; + clipRootActor = mClipper->GetRootActor(); } - if( mRenderableActor ) + for( std::vector::const_iterator it = mClippingDecorationActors.begin(), + endIt = mClippingDecorationActors.end(); + it != endIt; + ++it ) { - const Vector2 offset = mController->GetScrollPosition() + mController->GetAlignmentOffset(); - - mRenderableActor.SetPosition( offset.x, offset.y ); + Actor actor = *it; - // Make sure the actor is parented correctly with/without clipping - if( mClipper ) + if( clipRootActor ) { - mClipper->GetRootActor().Add( mRenderableActor ); + clipRootActor.Add( actor ); } else { - Self().Add( mRenderableActor ); + self.Add( actor ); } } + mClippingDecorationActors.clear(); + + // Make sure the actor is parented correctly with/without clipping + if( clipRootActor ) + { + clipRootActor.Add( mRenderableActor ); + } + else + { + self.Add( mRenderableActor ); + } } } @@ -958,7 +1013,14 @@ void TextField::OnKeyInputFocusGained() imfManager.SetRestoreAfterFocusLost( true ); } - mController->KeyboardFocusGainEvent(); + ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); + + if ( notifier ) + { + notifier.ContentSelectedSignal().Connect( this, &TextField::OnClipboardTextSelected ); + } + + mController->KeyboardFocusGainEvent(); // Called in the case of no virtual keyboard to trigger this event EmitKeyInputFocusSignal( true ); // Calls back into the Control hence done last. } @@ -981,6 +1043,13 @@ void TextField::OnKeyInputFocusLost() imfManager.EventReceivedSignal().Disconnect( this, &TextField::OnImfEvent ); } + ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); + + if ( notifier ) + { + notifier.ContentSelectedSignal().Disconnect( this, &TextField::OnClipboardTextSelected ); + } + mController->KeyboardFocusLostEvent(); EmitKeyInputFocusSignal( false ); // Calls back into the Control hence done last. @@ -1007,6 +1076,11 @@ void TextField::OnPan( const PanGesture& gesture ) mController->PanEvent( gesture.state, gesture.displacement ); } +void TextField::OnLongPress( const LongPressGesture& gesture ) +{ + mController->LongPressEvent( gesture.state, gesture.localPoint.x, gesture.localPoint.y ); +} + bool TextField::OnKeyEvent( const KeyEvent& event ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnKeyEvent %p keyCode %d\n", mController.Get(), event.keyCode ); @@ -1021,10 +1095,19 @@ bool TextField::OnKeyEvent( const KeyEvent& event ) return mController->KeyEvent( event ); } -ImfManager::ImfCallbackData TextField::OnImfEvent( Dali::ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent ) +void TextField::AddDecoration( Actor& actor, bool needsClipping ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnImfEvent %p eventName %d\n", mController.Get(), imfEvent.eventName ); - return mController->OnImfEvent( imfManager, imfEvent ); + if( actor ) + { + if( needsClipping ) + { + mClippingDecorationActors.push_back( actor ); + } + else + { + Self().Add( actor ); + } + } } void TextField::RequestTextRelayout() @@ -1032,12 +1115,36 @@ void TextField::RequestTextRelayout() RelayoutRequest(); } +void TextField::TextChanged() +{ + Dali::Toolkit::TextField handle( GetOwner() ); + mTextChangedSignal.Emit( handle ); +} + +void TextField::OnStageConnect( Dali::Actor actor ) +{ + if ( mHasBeenStaged ) + { + RenderText(); + } + else + { + mHasBeenStaged = true; + } +} + void TextField::MaxLengthReached() { Dali::Toolkit::TextField handle( GetOwner() ); mMaxLengthReachedSignal.Emit( handle ); } +ImfManager::ImfCallbackData TextField::OnImfEvent( Dali::ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent ) +{ + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::OnImfEvent %p eventName %d\n", mController.Get(), imfEvent.eventName ); + return mController->OnImfEvent( imfManager, imfEvent ); +} + void TextField::EnableClipping( bool clipping, const Vector2& size ) { if( clipping ) @@ -1066,6 +1173,11 @@ void TextField::EnableClipping( bool clipping, const Vector2& size ) } } +void TextField::OnClipboardTextSelected( ClipboardEventNotifier& clipboard ) +{ + mController->PasteClipboardItemEvent(); +} + void TextField::KeyboardStatusChanged(bool keyboardShown) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextField::KeyboardStatusChanged %p keyboardShown %d\n", mController.Get(), keyboardShown ); @@ -1075,6 +1187,21 @@ void TextField::KeyboardStatusChanged(bool keyboardShown) { mController->KeyboardFocusLostEvent(); } + else + { + mController->KeyboardFocusGainEvent(); // Initially called by OnKeyInputFocusGained + } +} + +void TextField::OnStageConnection( int depth ) +{ + // Call the Control::OnStageConnection() to set the depth of the background. + Control::OnStageConnection( depth ); + + // Sets the depth to the renderers inside the text's decorator. + mDecorator->SetTextDepth( depth ); + + // The depth of the text renderer is set in the RenderText() called from OnRelayout(). } bool TextField::OnTouched( Actor actor, const TouchEvent& event ) @@ -1085,7 +1212,8 @@ bool TextField::OnTouched( Actor actor, const TouchEvent& event ) TextField::TextField() : Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ), mRenderingBackend( DEFAULT_RENDERING_BACKEND ), - mExceedPolicy( Dali::Toolkit::TextField::EXCEED_POLICY_CLIP ) + mExceedPolicy( Dali::Toolkit::TextField::EXCEED_POLICY_CLIP ), + mHasBeenStaged( false ) { }