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 Version 1.3.0
[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
71768ee
..
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>
@@
-139,12
+139,14
@@
public:
* @param[in] numberOfCharacters The number of characters.
* @param[in] horizontalAlignment The horizontal alignment.
* @param[in,out] lines The laid-out lines.
* @param[in] numberOfCharacters The number of characters.
* @param[in] horizontalAlignment The horizontal alignment.
* @param[in,out] lines The laid-out lines.
+ * @param[out] alignmentOffset The alignment offset.
*/
void Align( const Size& size,
CharacterIndex startIndex,
Length numberOfCharacters,
*/
void Align( const Size& size,
CharacterIndex startIndex,
Length numberOfCharacters,
- Layout::HorizontalAlignment horizontalAlignment,
- Vector<LineRun>& lines );
+ Text::HorizontalAlignment::Type horizontalAlignment,
+ Vector<LineRun>& lines,
+ float& alignmentOffset );
/**
* @brief Sets the default line spacing.
/**
* @brief Sets the default line spacing.