Merge "TextVisual implementation." into devel/master

diff --combined automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
index c329ccc,e194fb4..0b767d7
--- 1/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
--- 2/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
@@@ -16,6 -16,8 +16,8 @@@
  
  #include <iostream>
  #include <stdlib.h>
+ #include <unistd.h>
+ 
  #include <dali-toolkit-test-suite-utils.h>
  #include <dali/public-api/rendering/renderer.h>
  #include <dali/public-api/rendering/texture-set.h>
@@@ -34,6 -36,8 +36,8 @@@ const char* TEST_SVG_FILE_NAME = TEST_R
  const char* TEST_OBJ_FILE_NAME = TEST_RESOURCE_DIR "/Cube.obj";
  const char* TEST_MTL_FILE_NAME = TEST_RESOURCE_DIR "/ToyRobot-Metal.mtl";
  const char* TEST_RESOURCE_LOCATION = TEST_RESOURCE_DIR "/";
+ 
+ const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
  }
  
  void dali_visual_startup(void)
@@@ -188,12 -192,6 +192,12 @@@ int UtcDaliVisualSize(void
    //  </svg>
    DALI_TEST_EQUALS( naturalSize, Vector2(100.f, 100.f), TEST_LOCATION );
  
 +  // svg visual with a size
 +  Visual::Base svgVisual2 = factory.CreateVisual( TEST_SVG_FILE_NAME, ImageDimensions(200, 200) );
 +  DALI_TEST_EQUALS( svgVisual2.GetSize(), Vector2( 200.f, 200.f ), TEST_LOCATION );
 +  svgVisual2.GetNaturalSize(naturalSize);
 +  DALI_TEST_EQUALS( naturalSize, Vector2(100.f, 100.f), TEST_LOCATION ); // Natural size should still be 100, 100
 +
    // Batch Image visual
    propertyMap.Clear();
    propertyMap.Insert( Visual::Property::TYPE, Visual::IMAGE );
@@@ -205,6 -203,31 +209,31 @@@
    batchImageVisual.GetNaturalSize( naturalSize );
    DALI_TEST_EQUALS( naturalSize, Vector2( 80.0f, 160.0f ), TEST_LOCATION );
  
+   // Text visual.
+ 
+   // Load some fonts to get the same metrics on different platforms.
+   TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
+   fontClient.SetDpi( 96u, 96u );
+ 
+   char* pathNamePtr = get_current_dir_name();
+   const std::string pathName( pathNamePtr );
+   free( pathNamePtr );
+ 
+   fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
+ 
+   propertyMap.Clear();
+   propertyMap.Insert( Visual::Property::TYPE, Visual::TEXT );
+   propertyMap.Insert( TextVisual::Property::ENABLE_MARKUP, true );
+   propertyMap.Insert( TextVisual::Property::TEXT, "<font family='TizenSans' size='12'>Hello world</font>" );
+   propertyMap.Insert( TextVisual::Property::MULTI_LINE, true );
+ 
+   Visual::Base textVisual = factory.CreateVisual( propertyMap );
+   textVisual.GetNaturalSize( naturalSize );
+   DALI_TEST_EQUALS( naturalSize, Size( 80.f, 20.f ), TEST_LOCATION );
+ 
+   const float height = textVisual.GetHeightForWidth( 40.f );
+   DALI_TEST_EQUALS( height, 40.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+ 
    END_TEST;
  }
  
@@@ -898,6 -921,95 +927,95 @@@ int UtcDaliVisualGetPropertyMapBatchIma
    END_TEST;
  }
  
+ //Text shape visual
+ int UtcDaliVisualGetPropertyMap10(void)
+ {
+   ToolkitTestApplication application;
+   tet_infoline( "UtcDaliVisualGetPropertyMap10: TextVisual" );
+ 
+   //Request PrimitiveVisual using a property map.
+   VisualFactory factory = VisualFactory::Get();
+ 
+   Property::Map propertyMap;
+   propertyMap.Insert( Visual::Property::TYPE, Visual::TEXT );
+   propertyMap.Insert( "renderingBackend", static_cast<int>( Toolkit::Text::DEFAULT_RENDERING_BACKEND ) );
+   propertyMap.Insert( "text", "Hello world" );
+   propertyMap.Insert( "fontFamily", "TizenSans" );
+   propertyMap.Insert( "fontStyle", "{\"weight\":\"bold\"}" );
+   propertyMap.Insert( "pointSize", 12.f );
+   propertyMap.Insert( "multiLine", true );
+   propertyMap.Insert( "horizontalAlignment", "CENTER" );
+   propertyMap.Insert( "verticalAlignment", "CENTER" );
+   propertyMap.Insert( "textColor", Color::RED );
+   propertyMap.Insert( "enableMarkup", false );
+   propertyMap.Insert( "enableAutoScroll", false );
+   propertyMap.Insert( "lineSpacing", 0.f );
+   propertyMap.Insert( "batchingEnabled", false );
+   Visual::Base textVisual = factory.CreateVisual( propertyMap );
+ 
+   Property::Map resultMap;
+   textVisual.CreatePropertyMap( resultMap );
+ 
+   //Check values in the result map are identical to the initial map's values.
+   Property::Value* value = resultMap.Find( Visual::Property::TYPE, Property::INTEGER );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_EQUALS( value->Get<int>(), (int)Visual::TEXT, TEST_LOCATION );
+ 
+   value = resultMap.Find( TextVisual::Property::RENDERING_BACKEND, Property::INTEGER );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_EQUALS( value->Get<int>(), Toolkit::Text::DEFAULT_RENDERING_BACKEND, TEST_LOCATION );
+ 
+   value = resultMap.Find( TextVisual::Property::TEXT, Property::STRING );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_EQUALS( value->Get<std::string>(), "Hello world", TEST_LOCATION );
+ 
+   value = resultMap.Find( TextVisual::Property::FONT_FAMILY, Property::STRING );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_EQUALS( value->Get<std::string>(), "TizenSans", TEST_LOCATION );
+ 
+   value = resultMap.Find( TextVisual::Property::FONT_STYLE, Property::STRING );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_EQUALS( value->Get<std::string>(), "{\"weight\":\"bold\"}", TEST_LOCATION );
+ 
+   value = resultMap.Find( TextVisual::Property::POINT_SIZE, Property::FLOAT );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_EQUALS( value->Get<float>(), 12.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+ 
+   value = resultMap.Find( TextVisual::Property::MULTI_LINE, Property::BOOLEAN );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_CHECK( value->Get<bool>() );
+ 
+   value = resultMap.Find( TextVisual::Property::HORIZONTAL_ALIGNMENT, Property::STRING );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_EQUALS( value->Get<std::string>(), "CENTER", TEST_LOCATION );
+ 
+   value = resultMap.Find( TextVisual::Property::VERTICAL_ALIGNMENT, Property::STRING );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_EQUALS( value->Get<std::string>(), "CENTER", TEST_LOCATION );
+ 
+   value = resultMap.Find( TextVisual::Property::TEXT_COLOR, Property::VECTOR4 );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_EQUALS( value->Get<Vector4>(), Color::RED, TEST_LOCATION );
+ 
+   value = resultMap.Find( TextVisual::Property::ENABLE_MARKUP, Property::BOOLEAN );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_CHECK( !value->Get<bool>() );
+ 
+   value = resultMap.Find( TextVisual::Property::ENABLE_AUTO_SCROLL, Property::BOOLEAN );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_CHECK( !value->Get<bool>() );
+ 
+   value = resultMap.Find( TextVisual::Property::LINE_SPACING, Property::FLOAT );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_EQUALS( value->Get<float>(), 0.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
+ 
+   value = resultMap.Find( TextVisual::Property::BATCHING_ENABLED, Property::BOOLEAN );
+   DALI_TEST_CHECK( value );
+   DALI_TEST_CHECK( !value->Get<bool>() );
+ 
+   END_TEST;
+ }
+ 
  int UtcDaliVisualGetPropertyMapBatchImageVisualNoAtlas(void)
  {
    ToolkitTestApplication application;

diff --combined dali-toolkit/internal/visuals/visual-base-impl.cpp
index 4156d1a,b5d5037..86d2114
--- 1/dali-toolkit/internal/visuals/visual-base-impl.cpp
--- 2/dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp
@@@ -84,6 -84,11 +84,11 @@@ const Vector2& Visual::Base::GetSize() 
    return mImpl->mSize;
  }
  
+ float Visual::Base::GetHeightForWidth( float width ) const
+ {
+   return 0.f;
+ }
+ 
  void Visual::Base::GetNaturalSize( Vector2& naturalSize ) const
  {
    naturalSize = Vector2::ZERO;
@@@ -116,7 -121,7 +121,7 @@@ void Visual::Base::SetOnStage( Actor& a
  
  void Visual::Base::SetOffStage( Actor& actor )
  {
 -  if( GetIsOnStage() )
 +  if( IsOnStage() )
    {
      DoSetOffStage( actor );
  
@@@ -124,6 -129,16 +129,16 @@@
    }
  }
  
+ void Visual::Base::CreatePropertyMap( Property::Map& map ) const
+ {
+   DoCreatePropertyMap( map );
+ 
+   if( mImpl->mCustomShader )
+   {
+     mImpl->mCustomShader->CreatePropertyMap( map );
+   }
+ }
+ 
  void Visual::Base::EnablePreMultipliedAlpha( bool preMultipled )
  {
    if(preMultipled)
@@@ -152,22 -167,12 +167,12 @@@ void Visual::Base::DoSetOffStage( Actor
    mImpl->mRenderer.Reset();
  }
  
- void Visual::Base::CreatePropertyMap( Property::Map& map ) const
- {
-   DoCreatePropertyMap( map );
- 
-   if( mImpl->mCustomShader )
-   {
-     mImpl->mCustomShader->CreatePropertyMap( map );
-   }
- }
- 
 -bool Visual::Base::GetIsOnStage() const
 +bool Visual::Base::IsOnStage() const
  {
    return mImpl->mFlags & Impl::IS_ON_STAGE;
  }
  
 -bool Visual::Base::GetIsFromCache() const
 +bool Visual::Base::IsFromCache() const
  {
    return mImpl->mFlags & Impl::IS_FROM_CACHE;
  }

diff --combined dali-toolkit/internal/visuals/visual-base-impl.h
index c073518,d15c2f3..3334842
--- 1/dali-toolkit/internal/visuals/visual-base-impl.h
--- 2/dali-toolkit/internal/visuals/visual-base-impl.h
+++ b/dali-toolkit/internal/visuals/visual-base-impl.h
@@@ -85,6 -85,11 +85,11 @@@ public
    const Vector2& GetSize() const;
  
    /**
+    * @copydoc Toolkit::Visual::Base::GetHeightForWidth
+    */
+   virtual float GetHeightForWidth( float width ) const;
+ 
+   /**
     * @copydoc Toolkit::Visual::Base::GetNaturalSize
     */
    virtual void GetNaturalSize( Vector2& naturalSize ) const;
@@@ -120,7 -125,7 +125,7 @@@
     *
     * @param[in] preMultipled whether alpha is pre-multiplied.
     */
-   void EnablePreMultipliedAlpha(  bool preMultipled );
+   void EnablePreMultipliedAlpha( bool preMultipled );
  
    /**
     * @brief Query whether alpha is pre-multiplied.
@@@ -194,20 -199,19 +199,20 @@@ protected
    virtual void DoSetOffStage( Actor& actor );
  
  protected:
 +
    /**
     * @brief Gets the on stage state for this Visual
     *
     * @return Returns true if this Visual is on stage, false if it is off the stage
     */
 -  bool GetIsOnStage() const;
 +  bool IsOnStage() const;
  
    /**
     * @brief Gets whether the Dali::Renderer is from a shared cache (and therefore any modifications will affect other users of that renderer)
     *
     * @return Returns true if the renderer is from shared cache, false otherwise
     */
 -  bool GetIsFromCache() const;
 +  bool IsFromCache() const;
  
  protected:
    /**

diff --combined dali-toolkit/internal/visuals/visual-factory-impl.cpp
index f76aeed,71fc2ba..76d0ba7
--- 1/dali-toolkit/internal/visuals/visual-factory-impl.cpp
--- 2/dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@@ -38,6 -38,7 +38,7 @@@
  #include <dali-toolkit/internal/visuals/npatch/npatch-visual.h>
  #include <dali-toolkit/internal/visuals/primitive/primitive-visual.h>
  #include <dali-toolkit/internal/visuals/svg/svg-visual.h>
+ #include <dali-toolkit/internal/visuals/text/text-visual.h>
  #include <dali-toolkit/internal/visuals/wireframe/wireframe-visual.h>
  #include <dali-toolkit/internal/visuals/visual-factory-cache.h>
  #include <dali-toolkit/internal/visuals/visual-factory-resolve-url.h>
@@@ -189,6 -190,12 +190,12 @@@ Toolkit::Visual::Base VisualFactory::Cr
        break;
      }
  
+     case Toolkit::Visual::TEXT:
+     {
+       visualPtr = new TextVisual( *( mFactoryCache.Get() ) );
+       break;
+     }
+ 
    }
  
    if( visualPtr )
@@@ -219,12 -226,17 +226,12 @@@ Toolkit::Visual::Base VisualFactory::Cr
    NinePatchImage npatchImage = NinePatchImage::DownCast( image );
    if( npatchImage )
    {
 -    NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
 -    visualPtr->SetImage( npatchImage );
 -
 +    NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ), npatchImage );
      return Toolkit::Visual::Base( visualPtr );
    }
    else
    {
 -    ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ) );
 -    Actor actor;
 -    visualPtr->SetImage( actor, image );
 -
 +    ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), image );
      return Toolkit::Visual::Base( visualPtr );
    }
  }
@@@ -245,17 -257,23 +252,17 @@@ Toolkit::Visual::Base VisualFactory::Cr
    UrlType::Type type = ResolveUrlType( url );
    if( UrlType::N_PATCH == type )
    {
 -    NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
 -    visualPtr->SetImage( url );
 -
 +    NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ), url );
      return Toolkit::Visual::Base( visualPtr );
    }
    else if( UrlType::SVG == type )
    {
 -    SvgVisual* visualPtr = new SvgVisual( *( mFactoryCache.Get() ) );
 -    visualPtr->SetImage( url, size );
 +    SvgVisual* visualPtr = new SvgVisual( *( mFactoryCache.Get() ), url, size );
      return Toolkit::Visual::Base( visualPtr );
    }
    else // Regular image
    {
 -    ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ));
 -    Actor actor;
 -    visualPtr->SetImage( actor, url, size );
 -
 +    ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), url, size );
      return Toolkit::Visual::Base( visualPtr );
    }
  }