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
TextModel - Layout a given range of characters inside a text.
[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
a029c83
..
f0c3fc6
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,9
+883,11
@@
void TextEditor::RenderText()
if( mRenderableActor )
{
if( mRenderableActor )
{
- const Vector2 offset = mController->GetScrollPosition() + mController->GetAlignmentOffset();
+ // TODO: Scroll and alignment needs to be refactored.
+ const Vector2& alignmentOffset = mController->GetAlignmentOffset();
+ const Vector2& scrollOffset = mController->GetScrollPosition();
- mRenderableActor.SetPosition(
offset.x, o
ffset.y );
+ mRenderableActor.SetPosition(
scrollOffset.x, alignmentOffset.y + scrollO
ffset.y );
Actor clipRootActor;
if( mClipper )
Actor clipRootActor;
if( mClipper )