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
/
rendering
/
text-typesetter.cpp
diff --git
a/dali-toolkit/internal/text/rendering/text-typesetter.cpp
b/dali-toolkit/internal/text/rendering/text-typesetter.cpp
index
c7d92c2
..
3184d4a
100755
(executable)
--- a/
dali-toolkit/internal/text/rendering/text-typesetter.cpp
+++ b/
dali-toolkit/internal/text/rendering/text-typesetter.cpp
@@
-281,17
+281,17
@@
PixelData Typesetter::Render( const Vector2& size, RenderBehaviour behaviour, bo
switch( mModel->GetVerticalAlignment() )
{
switch( mModel->GetVerticalAlignment() )
{
- case
Layout::VERTICAL_ALIGN_
TOP:
+ case
VerticalAlignment::
TOP:
{
// No offset to add.
break;
}
{
// No offset to add.
break;
}
- case
Layout::VERTICAL_ALIGN_
CENTER:
+ case
VerticalAlignment::
CENTER:
{
penY = static_cast<int>( 0.5f * ( size.height - layoutSize.height ) );
break;
}
{
penY = static_cast<int>( 0.5f * ( size.height - layoutSize.height ) );
break;
}
- case
Layout::VERTICAL_ALIGN_
BOTTOM:
+ case
VerticalAlignment::
BOTTOM:
{
penY = static_cast<int>( size.height - layoutSize.height );
break;
{
penY = static_cast<int>( size.height - layoutSize.height );
break;