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 "Pre-multiplied Alpha support for ImageView" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-view-interface.h
diff --git
a/dali-toolkit/internal/text/text-view-interface.h
b/dali-toolkit/internal/text/text-view-interface.h
index
56439d2
..
409f9d7
100644
(file)
--- a/
dali-toolkit/internal/text/text-view-interface.h
+++ b/
dali-toolkit/internal/text/text-view-interface.h
@@
-78,7
+78,8
@@
public:
* @note The returned number of glyphs may be less than @p numberOfGlyphs if a line has ellipsis.
*
* @param[out] glyphs Pointer to a buffer where the glyphs are copied.
* @note The returned number of glyphs may be less than @p numberOfGlyphs if a line has ellipsis.
*
* @param[out] glyphs Pointer to a buffer where the glyphs are copied.
- * @param[out] glyphPositions Pointer to a buffer where the glyph positions are copied.
+ * @param[out] glyphPositions Pointer to a buffer where the glyph's positions are copied.
+ * @param[out] colors Pointer to a buffer where the glyph's colors are copied.
* @param[in] glyphIndex Index to the first glyph.
* @param[in] numberOfGlyphs Number of glyphs to be copied.
*
* @param[in] glyphIndex Index to the first glyph.
* @param[in] numberOfGlyphs Number of glyphs to be copied.
*
@@
-86,6
+87,7
@@
public:
*/
virtual Length GetGlyphs( GlyphInfo* glyphs,
Vector2* glyphPositions,
*/
virtual Length GetGlyphs( GlyphInfo* glyphs,
Vector2* glyphPositions,
+ Vector4* glyphColors,
GlyphIndex glyphIndex,
Length numberOfGlyphs ) const = 0;
GlyphIndex glyphIndex,
Length numberOfGlyphs ) const = 0;