Merge "Fixed Text Quality Regression" into devel/master

diff --combined dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
index a2faebc,843fa86..789dfaf
--- 1/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
--- 2/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
+++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
@@@ -114,13 -114,13 +114,13 @@@ struct AtlasRenderer::Impl : public Con
                    bool underlineEnabled,
                    const Vector4& underlineColor,
                    float underlineHeight,
 -                  unsigned int depth )
 +                  int depth )
    {
      AtlasManager::AtlasSlot slot;
      std::vector< MeshRecord > meshContainer;
      Vector< Extent > extents;
      TextCacheEntry textCacheEntry;
 -    mDepth = static_cast< int >( depth );
 +    mDepth = depth;
  
      float currentUnderlinePosition = ZERO;
      float currentUnderlineThickness = underlineHeight;
@@@ -231,7 -231,7 +231,7 @@@
              }
  
              // Locate a new slot for our glyph
-             mGlyphManager.Add( glyph.fontId, glyph, bitmap, slot );
+             mGlyphManager.Add( glyph, bitmap, slot );
            }
          }
  
@@@ -251,7 -251,7 +251,7 @@@
                          currentUnderlinePosition,
                          currentUnderlineThickness,
                          slot );
-        lastFontId = glyph.fontId;
+         lastFontId = glyph.fontId;
        }
      }
  
@@@ -274,8 -274,9 +274,9 @@@
            actor.Add( GenerateShadow( *mIt, shadowOffset, shadowColor ) );
          }
  
-         if ( mActor )
+         if( mActor )
          {
+           actor.SetParentOrigin( ParentOrigin::CENTER ); // Keep all of the origins aligned
            mActor.Add( actor );
          }
          else
@@@ -318,11 -319,8 +319,11 @@@
  
      Material material = mGlyphManager.GetMaterial( meshRecord.mAtlasId );
      Dali::Renderer renderer = Dali::Renderer::New( quadGeometry, material );
 -    renderer.SetDepthIndex( mDepth );
 +    renderer.SetDepthIndex( CONTENT_DEPTH_INDEX + mDepth );
      Actor actor = Actor::New();
 +#if defined(DEBUG_ENABLED)
 +    actor.SetName( "Text renderable actor" );
 +#endif
      actor.AddRenderer( renderer );
      actor.SetSize( 1.0f, 1.0f );
      actor.SetColor( meshRecord.mColor );
@@@ -650,7 -648,7 +651,7 @@@
      Dali::Renderer renderer = Dali::Renderer::New( quadGeometry, material );
  
      // Ensure shadow is behind the text...
 -    renderer.SetDepthIndex( mDepth + CONTENT_DEPTH_INDEX - 1 );
 +    renderer.SetDepthIndex( CONTENT_DEPTH_INDEX + mDepth - 1 );
      Actor actor = Actor::New();
      actor.AddRenderer( renderer );
      actor.SetSize( 1.0f, 1.0f );
@@@ -734,7 -732,7 +735,7 @@@ Text::RendererPtr AtlasRenderer::New(
    return Text::RendererPtr( new AtlasRenderer() );
  }
  
 -Actor AtlasRenderer::Render( Text::ViewInterface& view, unsigned int depth )
 +Actor AtlasRenderer::Render( Text::ViewInterface& view, int depth )
  {
    UnparentAndReset( mImpl->mActor );