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
Text Alignment Enums now public
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
dali-toolkit-test-utils
/
toolkit-text-utils.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
index
43fc5ac
..
3758b47
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
@@
-281,7
+281,7
@@
void CreateTextModel( const std::string& text,
charactersToGlyph.Begin(),
glyphsPerCharacter.Begin(),
numberOfGlyphs,
charactersToGlyph.Begin(),
glyphsPerCharacter.Begin(),
numberOfGlyphs,
-
Layout::HORIZONTAL_ALIGN_
BEGIN,
+
Text::HorizontalAlignment::
BEGIN,
Layout::LineWrap::WORD );
Vector<LineRun>& lines = visualModel->mLines;
Layout::LineWrap::WORD );
Vector<LineRun>& lines = visualModel->mLines;
@@
-339,7
+339,7
@@
void CreateTextModel( const std::string& text,
layoutEngine.Align( textArea,
0u,
numberOfCharacters,
layoutEngine.Align( textArea,
0u,
numberOfCharacters,
-
Layout::HORIZONTAL_ALIGN_
BEGIN,
+
Text::HorizontalAlignment::
BEGIN,
lines,
alignmentOffset );
}
lines,
alignmentOffset );
}