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]
/
dali-toolkit
/
internal
/
text
/
layouts
/
layout-engine.h
diff --git
a/dali-toolkit/internal/text/layouts/layout-engine.h
b/dali-toolkit/internal/text/layouts/layout-engine.h
index
0d1f7d4
..
66525d1
100644
(file)
--- a/
dali-toolkit/internal/text/layouts/layout-engine.h
+++ b/
dali-toolkit/internal/text/layouts/layout-engine.h
@@
-23,7
+23,7
@@
#include <dali/public-api/math/vector2.h>
// INTERNAL INCLUDE
#include <dali/public-api/math/vector2.h>
// INTERNAL INCLUDE
-#include <dali-toolkit/
internal/text/layouts/layout-alignment
.h>
+#include <dali-toolkit/
public-api/text/text-enumerations
.h>
#include <dali-toolkit/internal/text/line-run.h>
#include <dali-toolkit/internal/text/metrics.h>
#include <dali-toolkit/internal/text/line-run.h>
#include <dali-toolkit/internal/text/metrics.h>
@@
-144,7
+144,7
@@
public:
void Align( const Size& size,
CharacterIndex startIndex,
Length numberOfCharacters,
void Align( const Size& size,
CharacterIndex startIndex,
Length numberOfCharacters,
-
Layout::HorizontalAlignment
horizontalAlignment,
+
Text::HorizontalAlignment::Type
horizontalAlignment,
Vector<LineRun>& lines,
float& alignmentOffset );
Vector<LineRun>& lines,
float& alignmentOffset );