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 "Updates following rename of PropertyBuffer to VertexBuffer" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
alignment
/
alignment-impl.cpp
diff --git
a/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
b/dali-toolkit/internal/controls/alignment/alignment-impl.cpp
index
6641d26
..
8000612
100644
(file)
--- a/
dali-toolkit/internal/controls/alignment/alignment-impl.cpp
+++ b/
dali-toolkit/internal/controls/alignment/alignment-impl.cpp
@@
-215,8
+215,8
@@
void Alignment::OnRelayout( const Vector2& size, RelayoutContainer& container )
{
Actor child = Self().GetChildAt(i);
{
Actor child = Self().GetChildAt(i);
- child.Set
AnchorPoint(
anchorPointAndParentOrigin );
- child.SetP
arentOrigin(
anchorPointAndParentOrigin );
+ child.Set
Property( Actor::Property::ANCHOR_POINT,
anchorPointAndParentOrigin );
+ child.SetP
roperty( Actor::Property::PARENT_ORIGIN,
anchorPointAndParentOrigin );
Vector2 currentChildSize( child.GetTargetSize().GetVectorXY() );
if( currentChildSize == Vector2::ZERO )
Vector2 currentChildSize( child.GetTargetSize().GetVectorXY() );
if( currentChildSize == Vector2::ZERO )
@@
-280,7
+280,7
@@
void Alignment::OnRelayout( const Vector2& size, RelayoutContainer& container )
}
}
}
}
- child.SetP
osition(
GetPosition( mPadding, mHorizontal, mVertical , newChildSize, currentChildSize ) );
+ child.SetP
roperty( Actor::Property::POSITION,
GetPosition( mPadding, mHorizontal, mVertical , newChildSize, currentChildSize ) );
if( renegotiate )
{
if( renegotiate )
{