X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-editor-impl.cpp;h=9d59568f261836fb5893ed89d5c4f0c93bb9c492;hb=8592f2596ececd2c3547082014cf24d3b82af30c;hp=9bbce3b9ac7cdf3a34587e99a94d0da4139950b0;hpb=5af1500ee4cbc72412934b8b7c7dc4ec0c206405;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp index 9bbce3b..9d59568 100644 --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include // INTERNAL INCLUDES @@ -121,6 +122,7 @@ DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "outline", DALI_PROPERTY_REGISTRATION( Toolkit, TextEditor, "inputOutline", STRING, INPUT_OUTLINE ) DALI_SIGNAL_REGISTRATION( Toolkit, TextEditor, "textChanged", SIGNAL_TEXT_CHANGED ) +DALI_SIGNAL_REGISTRATION( Toolkit, TextEditor, "inputStyleChanged", SIGNAL_INPUT_STYLE_CHANGED ) DALI_TYPE_REGISTRATION_END() @@ -904,6 +906,10 @@ bool TextEditor::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface { editor.TextChangedSignal().Connect( tracker, functor ); } + else if( 0 == strcmp( signalName.c_str(), SIGNAL_INPUT_STYLE_CHANGED ) ) + { + editor.InputStyleChangedSignal().Connect( tracker, functor ); + } else { // signalName does not match any signal @@ -918,11 +924,16 @@ Toolkit::TextEditor::TextChangedSignalType& TextEditor::TextChangedSignal() return mTextChangedSignal; } +Toolkit::TextEditor::InputStyleChangedSignalType& TextEditor::InputStyleChangedSignal() +{ + return mInputStyleChangedSignal; +} + void TextEditor::OnInitialize() { Actor self = Self(); - mController = Text::Controller::New( *this ); + mController = Text::Controller::New( this, this ); mDecorator = Text::Decorator::New( *mController, *mController ); @@ -938,6 +949,7 @@ void TextEditor::OnInitialize() // Disables the horizontal scrolling. mController->SetHorizontalScrollEnabled( false ); + // Sets the maximum number of characters. mController->SetMaximumNumberOfCharacters( std::numeric_limits::max() ); // Enable the smooth handle panning. @@ -1031,9 +1043,28 @@ void TextEditor::OnRelayout( const Vector2& size, RelayoutContainer& container ) mRenderer = Backend::Get().NewRenderer( mRenderingBackend ); } - EnableClipping( true, size ); + EnableClipping( size ); RenderText( updateTextType ); } + + // The text-editor emits signals when the input style changes. These changes of style are + // detected during the relayout process (size negotiation), i.e after the cursor has been moved. Signals + // can't be emitted during the size negotiation as the callbacks may update the UI. + // The text-editor adds an idle callback to the adaptor to emit the signals after the size negotiation. + if( !mController->IsInputStyleChangedSignalsQueueEmpty() ) + { + if( Adaptor::IsAvailable() ) + { + Adaptor& adaptor = Adaptor::Get(); + + if( NULL == mIdleCallback ) + { + // @note: The callback manager takes the ownership of the callback object. + mIdleCallback = MakeCallback( this, &TextEditor::OnIdleSignal ); + adaptor.AddIdle( mIdleCallback ); + } + } + } } void TextEditor::RenderText( Text::Controller::UpdateTextType updateTextType ) @@ -1205,21 +1236,6 @@ bool TextEditor::OnKeyEvent( const KeyEvent& event ) return mController->KeyEvent( event ); } -void TextEditor::AddDecoration( Actor& actor, bool needsClipping ) -{ - if( actor ) - { - if( needsClipping ) - { - mClippingDecorationActors.push_back( actor ); - } - else - { - Self().Add( actor ); - } - } -} - void TextEditor::RequestTextRelayout() { RelayoutRequest(); @@ -1236,6 +1252,75 @@ void TextEditor::MaxLengthReached() // Nothing to do as TextEditor doesn't emit a max length reached signal. } +void TextEditor::InputStyleChanged( Text::InputStyle::Mask inputStyleMask ) +{ + Dali::Toolkit::TextEditor handle( GetOwner() ); + + Toolkit::TextEditor::InputStyle::Mask editorInputStyleMask = Toolkit::TextEditor::InputStyle::NONE; + + if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_COLOR ) ) + { + editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::COLOR ); + } + if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_FONT_FAMILY ) ) + { + editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_FAMILY ); + } + if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_POINT_SIZE ) ) + { + editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::POINT_SIZE ); + } + if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_FONT_WEIGHT ) ) + { + editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE ); + } + if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_FONT_WIDTH ) ) + { + editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE ); + } + if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_FONT_SLANT ) ) + { + editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::FONT_STYLE ); + } + if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_LINE_SPACING ) ) + { + editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::LINE_SPACING ); + } + if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_UNDERLINE ) ) + { + editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::UNDERLINE ); + } + if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_SHADOW ) ) + { + editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::SHADOW ); + } + if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_EMBOSS ) ) + { + editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::EMBOSS ); + } + if( InputStyle::NONE != static_cast( inputStyleMask & InputStyle::INPUT_OUTLINE ) ) + { + editorInputStyleMask = static_cast( editorInputStyleMask | Toolkit::TextEditor::InputStyle::OUTLINE ); + } + + mInputStyleChangedSignal.Emit( handle, editorInputStyleMask ); +} + +void TextEditor::AddDecoration( Actor& actor, bool needsClipping ) +{ + if( actor ) + { + if( needsClipping ) + { + mClippingDecorationActors.push_back( actor ); + } + else + { + Self().Add( actor ); + } + } +} + void TextEditor::OnStageConnect( Dali::Actor actor ) { if ( mHasBeenStaged ) @@ -1269,31 +1354,23 @@ void TextEditor::GetHandleImagePropertyValue( Property::Value& value, Text::Han } } -void TextEditor::EnableClipping( bool clipping, const Vector2& size ) +void TextEditor::EnableClipping( 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 ) { - // 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 ) { - if( !mClipper ) - { - Actor self = Self(); + Actor self = Self(); - mClipper = Clipper::New( size ); - self.Add( mClipper->GetRootActor() ); - self.Add( mClipper->GetImageView() ); - } - else if ( mClipper ) - { - mClipper->Refresh( size ); - } + mClipper = Clipper::New( size ); + self.Add( mClipper->GetRootActor() ); + self.Add( mClipper->GetImageView() ); + } + else if ( mClipper ) + { + mClipper->Refresh( size ); } - } - else - { - // Note - this will automatically remove the root actor & the image view - mClipper.Reset(); } } @@ -1333,8 +1410,18 @@ bool TextEditor::OnTouched( Actor actor, const TouchData& touch ) return true; } +void TextEditor::OnIdleSignal() +{ + // Emits the change of input style signals. + mController->ProcessInputStyleChangedSignals(); + + // Set the pointer to null as the callback manager deletes the callback after execute it. + mIdleCallback = NULL; +} + TextEditor::TextEditor() -: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ), +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), + mIdleCallback( NULL ), mRenderingBackend( DEFAULT_RENDERING_BACKEND ), mHasBeenStaged( false ) { @@ -1343,6 +1430,12 @@ TextEditor::TextEditor() TextEditor::~TextEditor() { mClipper.Reset(); + + if( ( NULL != mIdleCallback ) && Adaptor::IsAvailable() ) + { + // Removes the callback from the callback manager in case the text-editor is destroyed before the callback is executed. + Adaptor::Get().RemoveIdle( mIdleCallback ); + } } } // namespace Internal