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
Merge "Makes the LTR/RTL alignment of text follow the system language by default...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
text
/
text-utils-devel.cpp
diff --git
a/dali-toolkit/devel-api/text/text-utils-devel.cpp
b/dali-toolkit/devel-api/text/text-utils-devel.cpp
index
0112e32
..
046d014
100644
(file)
--- a/
dali-toolkit/devel-api/text/text-utils-devel.cpp
+++ b/
dali-toolkit/devel-api/text/text-utils-devel.cpp
@@
-172,7
+172,10
@@
void ShapeTextPreprocess(const RendererParameters& textParameters, TextAbstracti
MarkupProcessData markupProcessData(colorRuns,
fontDescriptionRuns,
MarkupProcessData markupProcessData(colorRuns,
fontDescriptionRuns,
- textModel->mLogicalModel->mEmbeddedItems);
+ textModel->mLogicalModel->mEmbeddedItems,
+ textModel->mLogicalModel->mAnchors,
+ textModel->mLogicalModel->mUnderlinedCharacterRuns,
+ textModel->mLogicalModel->mBackgroundColorRuns);
if(textParameters.markupEnabled)
{
if(textParameters.markupEnabled)
{
@@
-1028,9
+1031,8
@@
Size LayoutText(const RendererParameters& textParameters, TextAbstraction::TextR
// Resize the vector of positions to have the same size than the vector of glyphs.
rendererParameters.positions.Resize(numberOfGlyphs);
// Resize the vector of positions to have the same size than the vector of glyphs.
rendererParameters.positions.Resize(numberOfGlyphs);
- textModel->mLineWrapMode = LineWrap::WORD;
- textModel->mIgnoreSpacesAfterText = false;
- textModel->mMatchSystemLanguageDirection = false;
+ textModel->mLineWrapMode = Text::LineWrap::WORD;
+ textModel->mIgnoreSpacesAfterText = false;
Text::Layout::Parameters layoutParameters(internalDataModel.textLayoutArea,
textModel);
Text::Layout::Parameters layoutParameters(internalDataModel.textLayoutArea,
textModel);