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-label-impl.cpp;h=290c64f9934400b62003cc2b7822d21d80607fc0;hp=60ca46ed67fa393ec85dc299c3a7f6736e82c042;hb=5b3cf0e6742934674bdf62bbe15af00e39eae566;hpb=c25b3c40178dadf12dc5e8f77c17413df0a55099 diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp index 60ca46e..290c64f 100644 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -20,14 +20,15 @@ // EXTERNAL INCLUDES #include -#include -#include +#include +#include #include // INTERNAL INCLUDES #include #include #include +#include #include using Dali::Toolkit::Text::LayoutEngine; @@ -50,7 +51,7 @@ 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 }, @@ -58,7 +59,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 }, @@ -75,19 +76,21 @@ BaseHandle Create() // Setup properties, signals and actions using the type-registry. DALI_TYPE_REGISTRATION_BEGIN( Toolkit::TextLabel, Toolkit::Control, Create ); -DALI_PROPERTY_REGISTRATION( TextLabel, "rendering-backend", INTEGER, RENDERING_BACKEND ) -DALI_PROPERTY_REGISTRATION( TextLabel, "text", STRING, TEXT ) -DALI_PROPERTY_REGISTRATION( TextLabel, "font-family", STRING, FONT_FAMILY ) -DALI_PROPERTY_REGISTRATION( TextLabel, "font-style", STRING, FONT_STYLE ) -DALI_PROPERTY_REGISTRATION( TextLabel, "point-size", FLOAT, POINT_SIZE ) -DALI_PROPERTY_REGISTRATION( TextLabel, "multi-line", BOOLEAN, MULTI_LINE ) -DALI_PROPERTY_REGISTRATION( TextLabel, "horizontal-alignment", STRING, HORIZONTAL_ALIGNMENT ) -DALI_PROPERTY_REGISTRATION( TextLabel, "vertical-alignment", STRING, VERTICAL_ALIGNMENT ) -DALI_PROPERTY_REGISTRATION( TextLabel, "text-color", VECTOR4, TEXT_COLOR ) -DALI_PROPERTY_REGISTRATION( TextLabel, "shadow-offset", VECTOR2, SHADOW_OFFSET ) -DALI_PROPERTY_REGISTRATION( TextLabel, "shadow-color", VECTOR4, SHADOW_COLOR ) -DALI_PROPERTY_REGISTRATION( TextLabel, "underline-enabled", BOOLEAN, UNDERLINE_ENABLED ) -DALI_PROPERTY_REGISTRATION( TextLabel, "underline-color", VECTOR4, UNDERLINE_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "rendering-backend", INTEGER, RENDERING_BACKEND ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "text", STRING, TEXT ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "font-family", STRING, FONT_FAMILY ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "font-style", STRING, FONT_STYLE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "point-size", FLOAT, POINT_SIZE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "multi-line", BOOLEAN, MULTI_LINE ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "horizontal-alignment", STRING, HORIZONTAL_ALIGNMENT ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "vertical-alignment", STRING, VERTICAL_ALIGNMENT ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "text-color", VECTOR4, TEXT_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "shadow-offset", VECTOR2, SHADOW_OFFSET ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "shadow-color", VECTOR4, SHADOW_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "underline-enabled", BOOLEAN, UNDERLINE_ENABLED ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "underline-color", VECTOR4, UNDERLINE_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, TextLabel, "underline-height", FLOAT, UNDERLINE_HEIGHT ) + DALI_TYPE_REGISTRATION_END() } // namespace @@ -118,7 +121,7 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr { case Toolkit::TextLabel::Property::RENDERING_BACKEND: { - int backend = value.Get< int >(); + const int backend = value.Get< int >(); if( impl.mRenderingBackend != backend ) { @@ -133,7 +136,6 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr if( impl.mController ) { impl.mController->SetText( value.Get< std::string >() ); - impl.RequestTextRelayout(); } break; } @@ -141,12 +143,11 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr { if( impl.mController ) { - std::string fontFamily = value.Get< std::string >(); + const std::string fontFamily = value.Get< std::string >(); if( impl.mController->GetDefaultFontFamily() != fontFamily ) { impl.mController->SetDefaultFontFamily( fontFamily ); - impl.RequestTextRelayout(); } } break; @@ -155,12 +156,11 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr { if( impl.mController ) { - std::string fontStyle = value.Get< std::string >(); + const std::string fontStyle = value.Get< std::string >(); if( impl.mController->GetDefaultFontStyle() != fontStyle ) { impl.mController->SetDefaultFontStyle( fontStyle ); - impl.RequestTextRelayout(); } } break; @@ -169,12 +169,11 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr { if( impl.mController ) { - float pointSize = value.Get< float >(); + const float pointSize = value.Get< float >(); - if( fabsf(impl.mController->GetDefaultPointSize() - pointSize) > Math::MACHINE_EPSILON_1 ) + if( !Equals( impl.mController->GetDefaultPointSize(), pointSize ) ) { impl.mController->SetDefaultPointSize( pointSize ); - impl.RequestTextRelayout(); } } break; @@ -183,55 +182,50 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr { if( impl.mController ) { - LayoutEngine& engine = impl.mController->GetLayoutEngine(); - LayoutEngine::Layout layout = value.Get< bool >() ? LayoutEngine::MULTI_LINE_BOX : LayoutEngine::SINGLE_LINE_BOX; - - if( engine.GetLayout() != layout ) - { - engine.SetLayout( layout ); - impl.RequestTextRelayout(); - } + impl.mController->SetMultiLineEnabled( value.Get< bool >() ); } break; } case Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT: { - LayoutEngine& engine = impl.mController->GetLayoutEngine(); - const LayoutEngine::HorizontalAlignment alignment = Scripting::GetEnumeration< Toolkit::Text::LayoutEngine::HorizontalAlignment >( value.Get< std::string >().c_str(), - HORIZONTAL_ALIGNMENT_STRING_TABLE, - HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT ); - - if( engine.GetHorizontalAlignment() != alignment ) + if( impl.mController ) { - engine.SetHorizontalAlignment( alignment ); - impl.RequestTextRelayout(); + LayoutEngine::HorizontalAlignment alignment( LayoutEngine::HORIZONTAL_ALIGN_BEGIN ); + if( Scripting::GetEnumeration< Toolkit::Text::LayoutEngine::HorizontalAlignment >( value.Get< std::string >().c_str(), + HORIZONTAL_ALIGNMENT_STRING_TABLE, + HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT, + alignment ) ) + { + impl.mController->SetHorizontalAlignment( alignment ); + } } break; } case Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT: { - LayoutEngine& engine = impl.mController->GetLayoutEngine(); - const LayoutEngine::VerticalAlignment alignment = Scripting::GetEnumeration< Toolkit::Text::LayoutEngine::VerticalAlignment >( value.Get< std::string >().c_str(), - VERTICAL_ALIGNMENT_STRING_TABLE, - VERTICAL_ALIGNMENT_STRING_TABLE_COUNT ); - - if( engine.GetVerticalAlignment() != alignment ) + if( impl.mController ) { - engine.SetVerticalAlignment( alignment ); - impl.RequestTextRelayout(); + LayoutEngine::VerticalAlignment alignment( LayoutEngine::VERTICAL_ALIGN_BOTTOM ); + if( Scripting::GetEnumeration< Toolkit::Text::LayoutEngine::VerticalAlignment >( value.Get< std::string >().c_str(), + VERTICAL_ALIGNMENT_STRING_TABLE, + VERTICAL_ALIGNMENT_STRING_TABLE_COUNT, + alignment ) ) + { + impl.mController->SetVerticalAlignment( alignment ); + } } break; } case Toolkit::TextLabel::Property::TEXT_COLOR: { - if ( impl.mController ) + if( impl.mController ) { - Vector4 textColor = value.Get< Vector4 >(); - if ( impl.mController->GetTextColor() != textColor ) + const Vector4 textColor = value.Get< Vector4 >(); + if( impl.mController->GetTextColor() != textColor ) { impl.mController->SetTextColor( textColor ); - impl.RequestTextRelayout(); + impl.mRenderer.Reset(); } } break; @@ -241,11 +235,11 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr { if( impl.mController ) { - Vector2 shadowOffset = value.Get< Vector2 >(); + const Vector2 shadowOffset = value.Get< Vector2 >(); if ( impl.mController->GetShadowOffset() != shadowOffset ) { impl.mController->SetShadowOffset( shadowOffset ); - impl.RequestTextRelayout(); + impl.mRenderer.Reset(); } } break; @@ -254,11 +248,11 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr { if( impl.mController ) { - Vector4 shadowColor = value.Get< Vector4 >(); + const Vector4 shadowColor = value.Get< Vector4 >(); if ( impl.mController->GetShadowColor() != shadowColor ) { impl.mController->SetShadowColor( shadowColor ); - impl.RequestTextRelayout(); + impl.mRenderer.Reset(); } } break; @@ -267,11 +261,11 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr { if( impl.mController ) { - Vector4 color = value.Get< Vector4 >(); + const Vector4 color = value.Get< Vector4 >(); if ( impl.mController->GetUnderlineColor() != color ) { impl.mController->SetUnderlineColor( color ); - impl.RequestTextRelayout(); + impl.mRenderer.Reset(); } } break; @@ -280,11 +274,25 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr { if( impl.mController ) { - bool enabled = value.Get< bool >(); + const bool enabled = value.Get< bool >(); if ( impl.mController->IsUnderlineEnabled() != enabled ) { impl.mController->SetUnderlineEnabled( enabled ); - impl.RequestTextRelayout(); + impl.mRenderer.Reset(); + } + } + break; + } + + case Toolkit::TextLabel::Property::UNDERLINE_HEIGHT: + { + if( impl.mController ) + { + float height = value.Get< float >(); + if ( impl.mController->GetUnderlineHeight() != height ) + { + impl.mController->SetUnderlineHeight( height ); + impl.mRenderer.Reset(); } } break; @@ -319,11 +327,35 @@ Property::Value TextLabel::GetProperty( BaseObject* object, Property::Index inde } break; } + case Toolkit::TextLabel::Property::FONT_FAMILY: + { + if( impl.mController ) + { + value = impl.mController->GetDefaultFontFamily(); + } + break; + } + case Toolkit::TextLabel::Property::FONT_STYLE: + { + if( impl.mController ) + { + value = impl.mController->GetDefaultFontStyle(); + } + break; + } + case Toolkit::TextLabel::Property::POINT_SIZE: + { + if( impl.mController ) + { + value = impl.mController->GetDefaultPointSize(); + } + break; + } case Toolkit::TextLabel::Property::MULTI_LINE: { if( impl.mController ) { - value = static_cast( LayoutEngine::MULTI_LINE_BOX == impl.mController->GetLayoutEngine().GetLayout() ); + value = impl.mController->IsMultiLineEnabled(); } break; } @@ -331,9 +363,13 @@ Property::Value TextLabel::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->GetHorizontalAlignment(), + HORIZONTAL_ALIGNMENT_STRING_TABLE, + HORIZONTAL_ALIGNMENT_STRING_TABLE_COUNT ); + if( name ) + { + value = std::string( name ); + } } break; } @@ -341,9 +377,13 @@ Property::Value TextLabel::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->GetVerticalAlignment(), + VERTICAL_ALIGNMENT_STRING_TABLE, + VERTICAL_ALIGNMENT_STRING_TABLE_COUNT ); + if( name ) + { + value = std::string( name ); + } } break; } @@ -387,6 +427,14 @@ Property::Value TextLabel::GetProperty( BaseObject* object, Property::Index inde } break; } + case Toolkit::TextLabel::Property::UNDERLINE_HEIGHT: + { + if ( impl.mController ) + { + value = impl.mController->GetUnderlineHeight(); + } + break; + } } } @@ -400,11 +448,16 @@ void TextLabel::OnInitialize() mController = Text::Controller::New( *this ); // Use height-for-width negotiation by default - self.SetResizePolicy( FILL_TO_PARENT, WIDTH ); - self.SetResizePolicy( DIMENSION_DEPENDENCY, HEIGHT ); + self.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); + self.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT ); + + // Enable the text ellipsis. + LayoutEngine& engine = mController->GetLayoutEngine(); + engine.SetTextEllipsisEnabled( true ); + self.OnStageSignal().Connect( this, &TextLabel::OnStageConnect ); } -void TextLabel::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change ) +void TextLabel::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) { GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } @@ -428,38 +481,78 @@ void TextLabel::OnRelayout( const Vector2& size, RelayoutContainer& container ) { mRenderer = Backend::Get().NewRenderer( mRenderingBackend ); } + RenderText(); + } +} - RenderableActor renderableActor; - if( mRenderer ) - { - renderableActor = mRenderer->Render( mController->GetView() ); - } +void TextLabel::RequestTextRelayout() +{ + RelayoutRequest(); +} - if( renderableActor != mRenderableActor ) - { - UnparentAndReset( mRenderableActor ); +void TextLabel::RenderText() +{ + Actor self = Self(); + Actor renderableActor; + if( mRenderer ) + { + renderableActor = mRenderer->Render( mController->GetView(), self.GetHierarchyDepth() ); + } - if( renderableActor ) - { - const Vector2& alignmentOffset = mController->GetAlignmentOffset(); - renderableActor.SetPosition( alignmentOffset.x, alignmentOffset.y ); + if( renderableActor != mRenderableActor ) + { + UnparentAndReset( mRenderableActor ); - Self().Add( renderableActor ); - } + if( renderableActor ) + { + const Vector2& alignmentOffset = mController->GetAlignmentOffset(); + renderableActor.SetPosition( alignmentOffset.x, alignmentOffset.y ); - mRenderableActor = renderableActor; + self.Add( renderableActor ); } + mRenderableActor = renderableActor; } } -void TextLabel::RequestTextRelayout() +void TextLabel::OnStageConnect( Dali::Actor actor ) { - RelayoutRequest(); + if ( mHasBeenStaged ) + { + RenderText(); + } + else + { + mHasBeenStaged = true; + } +} + +void TextLabel::AddDecoration( Actor& actor, bool needsClipping ) +{ + // TextLabel does not show decorations +} + +void TextLabel::OnStageConnection( int depth ) +{ + // Call the Control::OnStageConnection() to set the depth of the background. + Control::OnStageConnection( depth ); + + // The depth of the text renderer is set in the RenderText() called from OnRelayout(). +} + +void TextLabel::TextChanged() +{ + // TextLabel does not provide a signal for this +} + +void TextLabel::MaxLengthReached() +{ + // Pure Virtual from TextController Interface, only needed when inputting text } TextLabel::TextLabel() : Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ), - mRenderingBackend( DEFAULT_RENDERING_BACKEND ) + mRenderingBackend( DEFAULT_RENDERING_BACKEND ), + mHasBeenStaged( false ) { }