X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fitem-view%2Fitem-layout.cpp;h=33acbc43bc0dd968d06d0f1692f386408f636f1c;hb=3265a393922d260aa89757fb623ff830b60c3f58;hp=2f733e5edcb839b1b712fbe783aaa7b01bc33807;hpb=e217915091790637a8b4ea7e34480e852d242efd;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp index 2f733e5..33acbc4 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp @@ -200,10 +200,10 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d if (GetPositionConstraint(itemId, positionConstraint)) { WrappedVector3Constraint wrapped(positionConstraint, itemId); - Constraint constraint = Constraint::New( Actor::POSITION, + Constraint constraint = Constraint::New( Actor::Property::Position, Source( scrollPositionObject, scrollPositionProperty ), ParentSource( scrollSpeedProperty ), - ParentSource( Actor::SIZE ), + ParentSource( Actor::Property::Size ), wrapped ); constraint.SetApplyTime(durationSeconds); constraint.SetAlphaFunction(mAlphaFunction); @@ -215,10 +215,10 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d { WrappedQuaternionConstraint wrapped(rotationConstraint, itemId); - Constraint constraint = Constraint::New( Actor::ROTATION, + Constraint constraint = Constraint::New( Actor::Property::Rotation, Source( scrollPositionObject, scrollPositionProperty ), ParentSource( scrollSpeedProperty ), - ParentSource( Actor::SIZE ), + ParentSource( Actor::Property::Size ), wrapped ); constraint.SetApplyTime(durationSeconds); constraint.SetAlphaFunction(mAlphaFunction); @@ -231,10 +231,10 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d { WrappedVector3Constraint wrapped(scaleConstraint, itemId); - Constraint constraint = Constraint::New( Actor::SCALE, + Constraint constraint = Constraint::New( Actor::Property::Scale, Source( scrollPositionObject, scrollPositionProperty ), ParentSource( scrollSpeedProperty ), - ParentSource( Actor::SIZE ), + ParentSource( Actor::Property::Size ), wrapped ); constraint.SetApplyTime(durationSeconds); constraint.SetAlphaFunction(mAlphaFunction); @@ -247,10 +247,10 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d { WrappedVector4Constraint wrapped(colorConstraint, itemId); - Constraint constraint = Constraint::New( Actor::COLOR, + Constraint constraint = Constraint::New( Actor::Property::Color, Source( scrollPositionObject, scrollPositionProperty ), ParentSource( scrollSpeedProperty ), - ParentSource( Actor::SIZE ), + ParentSource( Actor::Property::Size ), wrapped ); constraint.SetApplyTime(durationSeconds); @@ -265,10 +265,10 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d { WrappedBoolConstraint wrapped(visibilityConstraint, itemId); - Constraint constraint = Constraint::New( Actor::VISIBLE, + Constraint constraint = Constraint::New( Actor::Property::Visible, Source( scrollPositionObject, scrollPositionProperty ), ParentSource( scrollSpeedProperty ), - ParentSource( Actor::SIZE ), + ParentSource( Actor::Property::Size ), wrapped ); constraint.SetApplyTime(durationSeconds);