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
[dali_1.9.15] Merge branch 'devel/master'
[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
9384ec8
..
0ddac75
100755
(executable)
--- a/
dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@
-1366,11
+1366,11
@@
void TextEditor::OnRelayout( const Vector2& size, RelayoutContainer& container )
if( mStencil )
{
if( mStencil )
{
- mStencil.SetP
osition( padding.start, padding.top
);
+ mStencil.SetP
roperty( Actor::Property::POSITION, Vector2( padding.start, padding.top )
);
}
if( mActiveLayer )
{
}
if( mActiveLayer )
{
- mActiveLayer.SetP
osition( padding.start, padding.top
);
+ mActiveLayer.SetP
roperty( Actor::Property::POSITION, Vector2( padding.start, padding.top )
);
}
const Text::Controller::UpdateTextType updateTextType = mController->Relayout( contentSize, layoutDirection );
}
const Text::Controller::UpdateTextType updateTextType = mController->Relayout( contentSize, layoutDirection );
@@
-1843,7
+1843,7
@@
void TextEditor::ApplyScrollPosition()
}
else if ( Equals( scrollAmount, 0.0f, Math::MACHINE_EPSILON_1 ))
{
}
else if ( Equals( scrollAmount, 0.0f, Math::MACHINE_EPSILON_1 ))
{
- mRenderableActor.SetP
osition( scrollOffset.x + mAlignmentOffset, scrollOffset.y - scrollAmount
);
+ mRenderableActor.SetP
roperty( Actor::Property::POSITION, Vector2( scrollOffset.x + mAlignmentOffset, scrollOffset.y - scrollAmount )
);
}
else
{
}
else
{