Italic synthesize for circular layout. 85/203385/1
authorVictor Cebollada <v.cebollada@samsung.com>
Wed, 20 Mar 2019 15:08:22 +0000 (15:08 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 12 Apr 2019 07:03:16 +0000 (08:03 +0100)
* Catch-up with the Adaptor's patch.

Change-Id: I80ec6566b8294856461588fba5f15d9ceea76dbe
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
dali-toolkit/devel-api/text/text-utils-devel.cpp

index faa90c5..dcc9ab8 100755 (executable)
@@ -802,8 +802,6 @@ Devel::PixelBuffer Render( const RendererParameters& textParameters, Vector<Embe
   // Set the position of the embedded items (if there is any).
   EmbeddedItemInfo* embeddedItemLayoutBuffer = embeddedItemLayout.Begin();
 
   // Set the position of the embedded items (if there is any).
   EmbeddedItemInfo* embeddedItemLayoutBuffer = embeddedItemLayout.Begin();
 
-  auto transformToArc = isClockwise ? &Dali::TextAbstraction::TransformToArcClockwise : &Dali::TextAbstraction::TransformToArcAntiClockwise;
-
   for( Length index = 0u, endIndex = embeddedItemLayout.Count(); index < endIndex; ++index )
   {
     EmbeddedItemInfo& embeddedItem = *( embeddedItemLayoutBuffer + index );
   for( Length index = 0u, endIndex = embeddedItemLayout.Count(); index < endIndex; ++index )
   {
     EmbeddedItemInfo& embeddedItem = *( embeddedItemLayoutBuffer + index );
@@ -842,7 +840,7 @@ Devel::PixelBuffer Render( const RendererParameters& textParameters, Vector<Embe
       }
       embeddedItem.angle = Degree( Radian( radians ) );
 
       }
       embeddedItem.angle = Degree( Radian( radians ) );
 
-      transformToArc( circularTextParameters, centerX, centerY );
+      Dali::TextAbstraction::TransformToArc( circularTextParameters, centerX, centerY );
 
       // Recalculate the size of the embedded item after the rotation to position it correctly.
       float width = embeddedItem.size.width;
 
       // Recalculate the size of the embedded item after the rotation to position it correctly.
       float width = embeddedItem.size.width;