X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Flayouts%2Flayout-parameters.h;h=e877e642ff5670193b5f30937117a2bef93786e5;hb=60adf82ffbedaf4f10b55cb5f5aac1cb7d514b16;hp=7f3e16924731874e7596456622e1943a61d1bdef;hpb=a8cc5814798a6df3859462486d593245ddaa17e5;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/layouts/layout-parameters.h b/dali-toolkit/internal/text/layouts/layout-parameters.h old mode 100644 new mode 100755 index 7f3e169..e877e64 --- a/dali-toolkit/internal/text/layouts/layout-parameters.h +++ b/dali-toolkit/internal/text/layouts/layout-parameters.h @@ -60,6 +60,9 @@ struct Parameters * @param[in] totalNumberOfGlyphs The number of glyphs. * @param[in] horizontalAlignment The horizontal alignment. * @param[in] lineWrapMode The text wrap mode. + * @param[in] outlineWidth The outline width. + * @param[in] ignoreSpaceAfterText Whether ignoring spaces after text or not. + * @param[in] matchSystemLanguageDirection Whether match align for system language direction or not.. */ Parameters( const Vector2& boundingBox, const Character* const textBuffer, @@ -74,7 +77,9 @@ struct Parameters Length totalNumberOfGlyphs, Text::HorizontalAlignment::Type horizontalAlignment, Text::LineWrap::Mode lineWrapMode, - float outlineWidth ) + float outlineWidth, + bool ignoreSpaceAfterText, + bool matchSystemLanguageDirection ) : boundingBox( boundingBox ), textBuffer( textBuffer ), lineBreakInfoBuffer( lineBreakInfoBuffer ), @@ -94,8 +99,11 @@ struct Parameters startLineIndex( 0u ), estimatedNumberOfLines( 0u ), lineWrapMode( lineWrapMode ), - isLastNewParagraph( false ), - outlineWidth( outlineWidth ) + outlineWidth( outlineWidth ), + ignoreSpaceAfterText( ignoreSpaceAfterText ), + matchSystemLanguageDirection ( matchSystemLanguageDirection ), + interGlyphExtraAdvance( 0.f ), + isLastNewParagraph( false ) {} Vector2 boundingBox; ///< The size of the box containing the text. @@ -117,8 +125,11 @@ struct Parameters LineIndex startLineIndex; ///< The line index where to insert the new lines. Length estimatedNumberOfLines; ///< The estimated number of lines. Text::LineWrap::Mode lineWrapMode; ///< The line wrap mode for moving to next line. - bool isLastNewParagraph; ///< Whether the last character is a new paragraph character. float outlineWidth; ///< The outline width. + bool ignoreSpaceAfterText:1; ///< Whether ignoring spaces after text or not. Default is true. + bool matchSystemLanguageDirection:1; ///< Whether match align for system language direction or not. Default is false. + float interGlyphExtraAdvance; ///< Extra advance added to each glyph. + bool isLastNewParagraph:1; ///< Whether the last character is a new paragraph character. }; } // namespace Layout