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-parameters.h
diff --git
a/dali-toolkit/internal/text/layouts/layout-parameters.h
b/dali-toolkit/internal/text/layouts/layout-parameters.h
index
fa33087
..
5deb666
100644
(file)
--- a/
dali-toolkit/internal/text/layouts/layout-parameters.h
+++ b/
dali-toolkit/internal/text/layouts/layout-parameters.h
@@
-22,6
+22,7
@@
#include <dali/public-api/math/vector2.h>
// INTERNAL INCLUDES
#include <dali/public-api/math/vector2.h>
// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/text/text-enumerations.h>
#include <dali-toolkit/internal/text/text-definitions.h>
#include <dali-toolkit/internal/text/layouts/layout-wrap-mode.h>
#include <dali-toolkit/internal/text/text-definitions.h>
#include <dali-toolkit/internal/text/layouts/layout-wrap-mode.h>
@@
-72,7
+73,7
@@
struct Parameters
const GlyphIndex* const charactersToGlyphsBuffer,
const Length* const glyphsPerCharacterBuffer,
Length totalNumberOfGlyphs,
const GlyphIndex* const charactersToGlyphsBuffer,
const Length* const glyphsPerCharacterBuffer,
Length totalNumberOfGlyphs,
-
HorizontalAlignment
horizontalAlignment,
+
Text::HorizontalAlignment::Type
horizontalAlignment,
LineWrap::Mode lineWrapMode )
: boundingBox( boundingBox ),
textBuffer( textBuffer ),
LineWrap::Mode lineWrapMode )
: boundingBox( boundingBox ),
textBuffer( textBuffer ),
@@
-111,7
+112,7
@@
struct Parameters
GlyphIndex startGlyphIndex; ///< Index to the first glyph to layout.
Length numberOfGlyphs; ///< The number of glyphs to layout.
Length totalNumberOfGlyphs; ///< The number of glyphs.
GlyphIndex startGlyphIndex; ///< Index to the first glyph to layout.
Length numberOfGlyphs; ///< The number of glyphs to layout.
Length totalNumberOfGlyphs; ///< The number of glyphs.
- HorizontalAlignment
horizontalAlignment; ///< The horizontal alignment.
+ HorizontalAlignment
::Type
horizontalAlignment; ///< The horizontal alignment.
LineIndex startLineIndex; ///< The line index where to insert the new lines.
Length estimatedNumberOfLines; ///< The estimated number of lines.
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.
LineWrap::Mode lineWrapMode; ///< The line wrap mode for moving to next line.