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
Revert "[Tizen] support match align for system language direciton"
[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
index
7f3e169
..
5a77d86
100644
(file)
--- a/
dali-toolkit/internal/text/layouts/layout-parameters.h
+++ b/
dali-toolkit/internal/text/layouts/layout-parameters.h
@@
-74,7
+74,8
@@
struct Parameters
Length totalNumberOfGlyphs,
Text::HorizontalAlignment::Type horizontalAlignment,
Text::LineWrap::Mode lineWrapMode,
Length totalNumberOfGlyphs,
Text::HorizontalAlignment::Type horizontalAlignment,
Text::LineWrap::Mode lineWrapMode,
- float outlineWidth )
+ float outlineWidth,
+ bool ignoreSpaceAfterText )
: boundingBox( boundingBox ),
textBuffer( textBuffer ),
lineBreakInfoBuffer( lineBreakInfoBuffer ),
: boundingBox( boundingBox ),
textBuffer( textBuffer ),
lineBreakInfoBuffer( lineBreakInfoBuffer ),
@@
-94,8
+95,9
@@
struct Parameters
startLineIndex( 0u ),
estimatedNumberOfLines( 0u ),
lineWrapMode( lineWrapMode ),
startLineIndex( 0u ),
estimatedNumberOfLines( 0u ),
lineWrapMode( lineWrapMode ),
+ outlineWidth( outlineWidth ),
isLastNewParagraph( false ),
isLastNewParagraph( false ),
-
outlineWidth( outlineWidth
)
+
ignoreSpaceAfterText( ignoreSpaceAfterText
)
{}
Vector2 boundingBox; ///< The size of the box containing the text.
{}
Vector2 boundingBox; ///< The size of the box containing the text.
@@
-117,8
+119,9
@@
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.
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.
};
} // namespace Layout
};
} // namespace Layout