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
[dali_1.3.45] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
layouts
/
layout-parameters.h
diff --git
a/dali-toolkit/internal/text/layouts/layout-parameters.h
b/dali-toolkit/internal/text/layouts/layout-parameters.h
old mode 100644
(file)
new mode 100755
(executable)
index
47aed0e
..
ecd1f6b
--- 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] 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,
*/
Parameters( const Vector2& boundingBox,
const Character* const textBuffer,
@@
-73,7
+76,10
@@
struct Parameters
const Length* const glyphsPerCharacterBuffer,
Length totalNumberOfGlyphs,
Text::HorizontalAlignment::Type horizontalAlignment,
const Length* const glyphsPerCharacterBuffer,
Length totalNumberOfGlyphs,
Text::HorizontalAlignment::Type horizontalAlignment,
- Text::LineWrap::Mode lineWrapMode )
+ Text::LineWrap::Mode lineWrapMode,
+ float outlineWidth,
+ bool ignoreSpaceAfterText,
+ bool matchSystemLanguageDirection )
: boundingBox( boundingBox ),
textBuffer( textBuffer ),
lineBreakInfoBuffer( lineBreakInfoBuffer ),
: boundingBox( boundingBox ),
textBuffer( textBuffer ),
lineBreakInfoBuffer( lineBreakInfoBuffer ),
@@
-93,7
+99,10
@@
struct Parameters
startLineIndex( 0u ),
estimatedNumberOfLines( 0u ),
lineWrapMode( lineWrapMode ),
startLineIndex( 0u ),
estimatedNumberOfLines( 0u ),
lineWrapMode( lineWrapMode ),
- isLastNewParagraph( false )
+ outlineWidth( outlineWidth ),
+ isLastNewParagraph( false ),
+ ignoreSpaceAfterText( ignoreSpaceAfterText ),
+ matchSystemLanguageDirection ( matchSystemLanguageDirection )
{}
Vector2 boundingBox; ///< The size of the box containing the text.
{}
Vector2 boundingBox; ///< The size of the box containing the text.
@@
-115,7
+124,10
@@
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.
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 isLastNewParagraph:1; ///< Whether the last character is a new paragraph character.
+ 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.
};
} // namespace Layout
};
} // namespace Layout