Merge "Set label padding in case of ResizePolicy::USE_NATURAL_SIZE - we don't...

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

diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
index c4da1ba..cbbe732 100644 (file)
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
@@ -93,10 +93,14 @@ public:
                Dali::Toolkit::AtlasManager::AtlasSlot& slot );
 
   /**
-   * @copydoc Toolkit::AtlasGlyphManager::SetAtlasSize
+   * @copydoc Toolkit::AtlasGlyphManager::GetAtlasSize
    */
-  void SetAtlasSize( const Vector2& size,
-                     const Vector2& blockSize );
+  Vector2 GetAtlasSize( uint32_t atlasId );
+
+  /**
+   * @copydoc Toolkit::AtlasGlyphManager::SetNewAtlasSize
+   */
+  void SetNewAtlasSize( uint32_t width, uint32_t height, uint32_t blockWidth, uint32_t blockHeight );
 
   /**
    * @copydoc Toolkit::AtlasGlyphManager::Remove
@@ -108,11 +112,17 @@ public:
    */
   Pixel::Format GetPixelFormat( uint32_t atlasId );
 
+  /**
+   * @copydoc toolkit::AtlasGlyphManager::GetMetrics
+   */
+  const Toolkit::AtlasGlyphManager::Metrics& GetMetrics();
+
 private:
 
   Dali::Toolkit::AtlasManager mAtlasManager;
   Vector< GlyphRecord > mGlyphRecords;
   uint32_t mCount;
+  Toolkit::AtlasGlyphManager::Metrics mMetrics;
 };
 
 } // namespace Internal