projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-glyph-manager.h
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
index
a90efdb
..
6a53481
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
@@
-39,6
+39,15
@@
class DALI_IMPORT_API AtlasGlyphManager : public BaseHandle
public:
/**
public:
/**
+ * Description of GlyphManager state
+ */
+ struct Metrics
+ {
+ uint32_t mGlyphCount; // number of glyphs being managed
+ AtlasManager::Metrics mAtlasMetrics; // metrics from the Atlas Manager
+ };
+
+ /**
* @brief Create a AtlasGlyphManager handle.
*
* Calling member functions with an uninitialised handle is not allowed.
* @brief Create a AtlasGlyphManager handle.
*
* Calling member functions with an uninitialised handle is not allowed.
@@
-107,8
+116,8
@@
public:
* @param[in] size size of the atlas in pixels
* @param[in] blockSize size of a block in this atlas in pixels
*/
* @param[in] size size of the atlas in pixels
* @param[in] blockSize size of a block in this atlas in pixels
*/
- void SetAtlasSize( const Vector2& size,
- const Vector2& blockSize );
+ void Set
New
AtlasSize( const Vector2& size,
+
const Vector2& blockSize );
/**
* @brief Unreference an image from the atlas and remove from cache if no longer needed
/**
* @brief Unreference an image from the atlas and remove from cache if no longer needed
@@
-120,11
+129,19
@@
public:
/**
* @brief Get the Pixel Format used by an atlas
*
/**
* @brief Get the Pixel Format used by an atlas
*
- * @param atlasId Id of atlas to check
+ * @param[in] atlasId Id of atlas to check
+ *
* @return The pixel format of the atlas
*/
Pixel::Format GetPixelFormat( uint32_t atlasId );
* @return The pixel format of the atlas
*/
Pixel::Format GetPixelFormat( uint32_t atlasId );
+ /**
+ * @brief Get Glyph Manager metrics
+ *
+ * @return const reference to glyph manager metrics
+ */
+ const Metrics& GetMetrics();
+
private:
explicit DALI_INTERNAL AtlasGlyphManager(Internal::AtlasGlyphManager *impl);
private:
explicit DALI_INTERNAL AtlasGlyphManager(Internal::AtlasGlyphManager *impl);