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-field-impl.cpp
diff --git
a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
index
2b4fcc0
..
7e2d143
100755
(executable)
--- a/
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@
-1434,11
+1434,11
@@
void TextField::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 );
@@
-1540,7
+1540,7
@@
void TextField::RenderText( Text::Controller::UpdateTextType updateTextType )
renderableActorPositionY = scrollOffset.y + padding.top;
}
renderableActorPositionY = scrollOffset.y + padding.top;
}
- mRenderableActor.SetP
osition( renderableActorPositionX, renderableActorPositionY
);
+ mRenderableActor.SetP
roperty( Actor::Property::POSITION, Vector2( renderableActorPositionX, renderableActorPositionY )
);
// Make sure the actors are parented correctly with/without clipping
Actor self = mStencil ? mStencil : Self();
// Make sure the actors are parented correctly with/without clipping
Actor self = mStencil ? mStencil : Self();
@@
-1569,13
+1569,13
@@
void TextField::RenderText( Text::Controller::UpdateTextType updateTextType )
if ( mDecorator && mDecorator->IsHighlightVisible() )
{
self.Add( mBackgroundActor );
if ( mDecorator && mDecorator->IsHighlightVisible() )
{
self.Add( mBackgroundActor );
- mBackgroundActor.SetP
osition( renderableActorPositionX, renderableActorPositionY
); // In text field's coords.
+ mBackgroundActor.SetP
roperty( Actor::Property::POSITION, Vector2( renderableActorPositionX, renderableActorPositionY)
); // In text field's coords.
mBackgroundActor.LowerBelow( highlightActor );
}
else
{
mRenderableActor.Add( mBackgroundActor );
mBackgroundActor.LowerBelow( highlightActor );
}
else
{
mRenderableActor.Add( mBackgroundActor );
- mBackgroundActor.SetP
osition( 0.0f, 0.0f
); // In renderable actor's coords.
+ mBackgroundActor.SetP
roperty( Actor::Property::POSITION, Vector2( 0.0f, 0.0f )
); // In renderable actor's coords.
mBackgroundActor.LowerToBottom();
}
}
mBackgroundActor.LowerToBottom();
}
}