TextLabel property fixes

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / text-controls / text-label-impl.cpp

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 93c5500..2bdacc4 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@ -23,14 +23,17 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/text/layouts/layout-engine.h>
-#include <dali-toolkit/public-api/text/rendering/basic/text-basic-renderer.h> // TODO - Get from RendererFactory
+#include <dali-toolkit/internal/text/layouts/layout-engine.h>
+#include <dali-toolkit/internal/text/rendering/text-backend.h>
 
 using Dali::Toolkit::Text::LayoutEngine;
+using Dali::Toolkit::Text::Backend;
 
 namespace
 {
 
+const unsigned int DEFAULT_RENDERING_BACKEND = 0;
+
 } // namespace
 
 namespace Dali
@@ -39,8 +42,9 @@ namespace Dali
 namespace Toolkit
 {
 
-const Property::Index TextLabel::PROPERTY_TEXT(       Internal::TextLabel::TEXTLABEL_PROPERTY_START_INDEX );
-const Property::Index TextLabel::PROPERTY_MULTI_LINE( Internal::TextLabel::TEXTLABEL_PROPERTY_START_INDEX + 1 );
+const Property::Index TextLabel::PROPERTY_RENDERING_BACKEND( Internal::TextLabel::TEXTLABEL_PROPERTY_START_INDEX );
+const Property::Index TextLabel::PROPERTY_TEXT(              Internal::TextLabel::TEXTLABEL_PROPERTY_START_INDEX + 1 );
+const Property::Index TextLabel::PROPERTY_MULTI_LINE(        Internal::TextLabel::TEXTLABEL_PROPERTY_START_INDEX + 2 );
 
 namespace Internal
 {
@@ -56,8 +60,9 @@ BaseHandle Create()
 
 TypeRegistration mType( typeid(Toolkit::TextLabel), typeid(Toolkit::Control), Create );
 
-PropertyRegistration property1( mType, "text",       Toolkit::TextLabel::PROPERTY_TEXT,       Property::STRING, &TextLabel::SetProperty, &TextLabel::GetProperty );
-PropertyRegistration property2( mType, "multi-line", Toolkit::TextLabel::PROPERTY_MULTI_LINE, Property::STRING, &TextLabel::SetProperty, &TextLabel::GetProperty );
+PropertyRegistration property1( mType, "rendering-backend", Toolkit::TextLabel::PROPERTY_RENDERING_BACKEND, Property::INTEGER,          &TextLabel::SetProperty, &TextLabel::GetProperty );
+PropertyRegistration property2( mType, "text",              Toolkit::TextLabel::PROPERTY_TEXT,              Property::STRING,           &TextLabel::SetProperty, &TextLabel::GetProperty );
+PropertyRegistration property3( mType, "multi-line",        Toolkit::TextLabel::PROPERTY_MULTI_LINE,        Property::STRING,           &TextLabel::SetProperty, &TextLabel::GetProperty );
 
 } // namespace
 
@@ -76,28 +81,43 @@ Toolkit::TextLabel TextLabel::New()
   return handle;
 }
 
-void TextLabel::SetRenderer( Text::RendererPtr renderer )
-{
-  mRenderer = renderer;
-}
-
 void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Property::Value& value )
 {
   Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( Dali::BaseHandle( object ) );
 
   if( label )
   {
-    TextLabel& labelImpl( GetImpl( label ) );
+    TextLabel& impl( GetImpl( label ) );
     switch( index )
     {
+      case Toolkit::TextLabel::PROPERTY_RENDERING_BACKEND:
+      {
+        unsigned int backend = value.Get< int >();
+
+        if( impl.mRenderingBackend != backend )
+        {
+          impl.mRenderingBackend = static_cast< unsigned int >( backend );
+          impl.mRenderer.Reset();
+          impl.RequestTextRelayout();
+        }
+        break;
+      }
       case Toolkit::TextLabel::PROPERTY_TEXT:
       {
-        labelImpl.SetText( value.Get< std::string >() );
+        if( impl.mController )
+        {
+          impl.mController->SetText( value.Get< std::string >() );
+        }
         break;
       }
       case Toolkit::TextLabel::PROPERTY_MULTI_LINE:
       {
-        labelImpl.SetMultiLine( value.Get< bool >() );
+        if( impl.mController )
+        {
+          LayoutEngine::Layout layout = value.Get< bool >() ? LayoutEngine::MULTI_LINE_BOX : LayoutEngine::SINGLE_LINE_BOX;
+          impl.mController->GetLayoutEngine().SetLayout( layout );
+          impl.RequestTextRelayout();
+        }
         break;
       }
     }
@@ -112,13 +132,36 @@ Property::Value TextLabel::GetProperty( BaseObject* object, Property::Index inde
 
   if( label )
   {
+    TextLabel& impl( GetImpl( label ) );
     switch( index )
     {
+      case Toolkit::TextLabel::PROPERTY_RENDERING_BACKEND:
+      {
+        value = impl.mRenderingBackend;
+        break;
+      }
+
       case Toolkit::TextLabel::PROPERTY_TEXT:
       {
+        if( impl.mController )
+        {
+          std::string text;
+          impl.mController->GetText( text );
+          value = text;
+        }
+
         DALI_LOG_WARNING( "UTF-8 text representation was discarded\n" );
         break;
       }
+
+      case Toolkit::TextLabel::PROPERTY_MULTI_LINE:
+      {
+        if( impl.mController )
+        {
+          value = static_cast<bool>( LayoutEngine::MULTI_LINE_BOX == impl.mController->GetLayoutEngine().GetLayout() );
+        }
+        break;
+      }
     }
   }
 
@@ -127,7 +170,7 @@ Property::Value TextLabel::GetProperty( BaseObject* object, Property::Index inde
 
 void TextLabel::OnInitialize()
 {
-  mController = Text::Controller::New();
+  mController = Text::Controller::New( *this );
 }
 
 Vector3 TextLabel::GetNaturalSize()
@@ -142,52 +185,42 @@ float TextLabel::GetHeightForWidth( float width )
 
 void TextLabel::OnRelayout( const Vector2& size, ActorSizeContainer& container )
 {
-  if( mController->Relayout( size ) )
+  if( mController->Relayout( size ) ||
+      !mRenderer )
   {
     if( !mRenderer )
     {
-      // TODO - Get from RendererFactory
-      mRenderer = Dali::Toolkit::Text::BasicRenderer::New();
+      mRenderer = Backend::Get().NewRenderer( mRenderingBackend );
     }
 
+    RenderableActor renderableActor;
     if( mRenderer )
     {
-      Actor renderableActor = mRenderer->Render( mController->GetView() );
+      renderableActor = mRenderer->Render( mController->GetView() );
+    }
+
+    if( renderableActor != mRenderableActor )
+    {
+      UnparentAndReset( mRenderableActor );
 
       if( renderableActor )
       {
         Self().Add( renderableActor );
       }
-    }
-  }
-}
 
-void TextLabel::SetText( const std::string& text )
-{
-  if( mController )
-  {
-    // The Controller updates the View for the renderer
-    mController->SetText( text );
+      mRenderableActor = renderableActor;
+    }
   }
 }
 
-void TextLabel::SetMultiLine( bool multiLine )
+void TextLabel::RequestTextRelayout()
 {
-  if( mController )
-  {
-    if( multiLine )
-    {
-      mController->GetLayoutEngine().SetLayout( LayoutEngine::MULTI_LINE_BOX );
-    }
-    else
-    {
-      mController->GetLayoutEngine().SetLayout( LayoutEngine::SINGLE_LINE_BOX );
-    }
-  }
+  RelayoutRequest();
 }
 
 TextLabel::TextLabel()
-: Control( ControlBehaviour( CONTROL_BEHAVIOUR_NONE ) )
+: Control( ControlBehaviour( CONTROL_BEHAVIOUR_NONE ) ),
+  mRenderingBackend( DEFAULT_RENDERING_BACKEND )
 {
 }