X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fvisual-model-impl.h;h=7c1accb1420a32155cee8acaeb9ea882fea4c8fd;hb=ce9f965e8f8f51ae0992a85db9fd919519992a65;hp=a0339a484518b7dc1144bf5b24048b6fd233a445;hpb=e5a56dace042712c1d89015bcb43942dfb237af8;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/visual-model-impl.h b/dali-toolkit/internal/text/visual-model-impl.h index a0339a4..7c1accb 100644 --- a/dali-toolkit/internal/text/visual-model-impl.h +++ b/dali-toolkit/internal/text/visual-model-impl.h @@ -67,18 +67,22 @@ public: * @pre The glyphs per character table needs to be created first. * * @param[in] startIndex The character from where the conversion table is created. + * @param[in] startGlyphIndex The glyph from where the conversion table is created. * @param[in] numberOfCharacters The number of characters. */ void CreateCharacterToGlyphTable( CharacterIndex startIndex, + GlyphIndex startGlyphIndex, Length numberOfCharacters ); /** * @brief Creates an array containing the number of glyphs per character. * * @param[in] startIndex The character from where the table is created. + * @param[in] startGlyphIndex The glyph from where the conversion table is created. * @param[in] numberOfCharacters The number of characters. */ void CreateGlyphsPerCharacterTable( CharacterIndex startIndex, + GlyphIndex startGlyphIndex, Length numberOfCharacters ); /** @@ -306,7 +310,8 @@ public: Vector mGlyphPositions; ///< For each glyph, the position. Vector mLines; ///< The laid out lines. Vector mUnderlineRuns; ///< Runs of glyphs that are underlined. - Vector mColorRuns; ///< Runs of glyphs with the same color. + Vector mColors; ///< Colors of the glyphs. + Vector mColorIndices; ///< Indices to the vector of colors for each glyphs. Vector2 mControlSize; ///< The size of the UI control the decorator is adding it's decorations to. Vector4 mTextColor; ///< The text color @@ -327,7 +332,6 @@ public: bool mUnderlineEnabled:1; ///< Underline enabled flag bool mUnderlineColorSet:1; ///< Has the underline color been explicitly set? - }; } // namespace Text