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
Remove alignment from text controller.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-editor-impl.cpp
diff --git
a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
index
57a66ca
..
aad20f9
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@
-883,11
+883,9
@@
void TextEditor::RenderText()
if( mRenderableActor )
{
if( mRenderableActor )
{
- // TODO: Scroll and alignment needs to be refactored.
- const Vector2& alignmentOffset = mController->GetAlignmentOffset();
const Vector2& scrollOffset = mController->GetScrollPosition();
const Vector2& scrollOffset = mController->GetScrollPosition();
- mRenderableActor.SetPosition( scrollOffset.x,
alignmentOffset.y +
scrollOffset.y );
+ mRenderableActor.SetPosition( scrollOffset.x, scrollOffset.y );
Actor clipRootActor;
if( mClipper )
Actor clipRootActor;
if( mClipper )