X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fline-run.h;h=9023121f3a3574139ef15bb1a20082bf9890210f;hb=85c7065a159374bac65ff799a0a977f930b8e694;hp=584d758820419abf96081b0b8c9b3f7adf28e0cd;hpb=31df2b9472ccbe0ae460a958535be8ef790c96f2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/line-run.h b/dali-toolkit/internal/text/line-run.h index 584d758..9023121 100644 --- a/dali-toolkit/internal/text/line-run.h +++ b/dali-toolkit/internal/text/line-run.h @@ -18,11 +18,9 @@ * */ -// EXTERNAL INCLUDES -#include - // INTERNAL INCLUDES #include +#include namespace Dali { @@ -38,14 +36,14 @@ namespace Text */ struct LineRun { - GlyphIndex glyphIndex; ///< The initial glyph index. - Length numberOfGlyphs; ///< The number of glyphs of the run. - CharacterRun characterRun; ///< The initial character and the number of characters. + GlyphRun glyphRun; ///< The initial glyph index and the number of glyphs of the run. + CharacterRun characterRun; ///< The initial character index and the number of characters of the run. float width; ///< The line's width. float ascender; ///< The line's ascender. float descender; ///< The line's descender. float extraLength; ///< The length of the white spaces at the end of the line. float alignmentOffset; ///< The horizontal alignment offset. + float lineSpacing; ///< The line's spacing CharacterDirection direction : 1; ///< Direction of the first character of the paragraph. bool ellipsis : 1; ///< Wheter ellipsis is added to the line. };