Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / rendering / atlas / atlas-glyph-manager-impl.cpp

diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
index 001281e..16fdc8a 100644 (file)
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
@@ -108,10 +108,15 @@ void AtlasGlyphManager::Cached( Text::FontId fontId,
   slot.mImageId = 0;
 }
 
-void AtlasGlyphManager::SetAtlasSize( const Vector2& size,
-                                      const Vector2& blockSize )
+Vector2 AtlasGlyphManager::GetAtlasSize( uint32_t atlasId )
 {
-    mAtlasManager.SetAtlasSize( size, blockSize );
+  return mAtlasManager.GetAtlasSize( atlasId );
+}
+
+void AtlasGlyphManager::SetNewAtlasSize( const Vector2& size,
+                                         const Vector2& blockSize )
+{
+    mAtlasManager.SetNewAtlasSize( size, blockSize );
 }
 
 void AtlasGlyphManager::Remove( uint32_t imageId )
@@ -134,6 +139,13 @@ Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId )
   return mAtlasManager.GetPixelFormat( atlasId );
 }
 
+const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
+{
+  mMetrics.mGlyphCount = mGlyphRecords.Size();
+  mAtlasManager.GetMetrics( mMetrics.mAtlasMetrics );
+  return mMetrics;
+}
+
 } // namespace Internal
 
 } // namespace Toolkit