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 "Note that some Text propeties in devel api can't be changed" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
color-segmentation.h
diff --git
a/dali-toolkit/internal/text/color-segmentation.h
b/dali-toolkit/internal/text/color-segmentation.h
index
9e52de1
..
0a816ab
100644
(file)
--- a/
dali-toolkit/internal/text/color-segmentation.h
+++ b/
dali-toolkit/internal/text/color-segmentation.h
@@
-38,15
+38,23
@@
class LogicalModel;
/**
* @brief Creates color glyph runs.
*
/**
* @brief Creates color glyph runs.
*
- * @param[in] c
haracterC
olorRuns The color runs in characters (set in the mark-up string).
+ * @param[in] colorRuns The color runs in characters (set in the mark-up string).
* @param[in] charactersToGlyph Conversion table from characters to glyphs.
* @param[in] glyphsPerCharacter Table with the number of glyphs for each character.
* @param[in] charactersToGlyph Conversion table from characters to glyphs.
* @param[in] glyphsPerCharacter Table with the number of glyphs for each character.
- * @param[out] glyphColorRuns The color runs in glyphs.
+ * @param[in] startCharacterIndex The character from where the text is shaped.
+ * @param[in] startGlyphIndex The glyph from where the text is shaped.
+ * @param[in] numberOfCharacters The number of characters to be shaped.
+ * @param[out] colors The vector of colors.
+ * @param[out] colorIndices Indices to the vector of colors.
*/
*/
-void SetColorSegmentationInfo( const Vector<ColorRun>& c
haracterC
olorRuns,
+void SetColorSegmentationInfo( const Vector<ColorRun>& colorRuns,
const Vector<GlyphIndex>& charactersToGlyph,
const Vector<Length>& glyphsPerCharacter,
const Vector<GlyphIndex>& charactersToGlyph,
const Vector<Length>& glyphsPerCharacter,
- Vector<ColorGlyphRun>& glyphColorRuns );
+ CharacterIndex startCharacterIndex,
+ GlyphIndex startGlyphIndex,
+ Length numberOfCharacters,
+ Vector<Vector4>& colors,
+ Vector<ColorIndex>& colorIndices );
} // namespace Text
} // namespace Text