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
Merge "Fixed a problem where text size exceeds maximum texture size." into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller-impl.cpp
diff --git
a/dali-toolkit/internal/text/text-controller-impl.cpp
b/dali-toolkit/internal/text/text-controller-impl.cpp
index
0101616
..
c1eb0e4
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/
dali-toolkit/internal/text/text-controller-impl.cpp
@@
-73,7
+73,7
@@
EventData::EventData( DecoratorPtr decorator )
mPlaceholderFont( NULL ),
mPlaceholderTextActive(),
mPlaceholderTextInactive(),
mPlaceholderFont( NULL ),
mPlaceholderTextActive(),
mPlaceholderTextInactive(),
- mPlaceholderTextColor( 0.8f, 0.8f, 0.8f, 0.8f ),
+ mPlaceholderTextColor( 0.8f, 0.8f, 0.8f, 0.8f ),
// This color has been published in the Public API (placeholder-properties.h).
mEventQueue(),
mInputStyleChangedQueue(),
mPreviousState( INACTIVE ),
mEventQueue(),
mInputStyleChangedQueue(),
mPreviousState( INACTIVE ),
@@
-2611,17
+2611,17
@@
void Controller::Impl::GetCursorPosition( CharacterIndex logical,
switch( mModel->mHorizontalAlignment )
{
switch( mModel->mHorizontalAlignment )
{
- case
Layout::HORIZONTAL_ALIGN_BEGIN
:
+ case
Text::HorizontalAlignment::BEGIN
:
{
cursorInfo.primaryPosition.x = 0.f;
break;
}
{
cursorInfo.primaryPosition.x = 0.f;
break;
}
- case
Layout::HORIZONTAL_ALIGN_
CENTER:
+ case
Text::HorizontalAlignment::
CENTER:
{
cursorInfo.primaryPosition.x = floorf( 0.5f * mModel->mVisualModel->mControlSize.width );
break;
}
{
cursorInfo.primaryPosition.x = floorf( 0.5f * mModel->mVisualModel->mControlSize.width );
break;
}
- case
Layout::HORIZONTAL_ALIGN_
END:
+ case
Text::HorizontalAlignment::
END:
{
cursorInfo.primaryPosition.x = mModel->mVisualModel->mControlSize.width - mEventData->mDecorator->GetCursorWidth();
break;
{
cursorInfo.primaryPosition.x = mModel->mVisualModel->mControlSize.width - mEventData->mDecorator->GetCursorWidth();
break;