X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-depth-effect-impl.cpp;h=8b6003f7484ae2d888a9fb3f09265d4a47184ad7;hb=refs%2Fchanges%2F46%2F36346%2F1;hp=05c2cd58008f547563c0f71d6bf88a19805cc31f;hpb=6d762b4acd946b3d02e76c1805e7af9a1a5b1809;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp index 05c2cd5..8b6003f 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-depth-effect-impl.cpp @@ -336,24 +336,24 @@ void ApplyScrollDepthConstraints(Toolkit::ScrollView scrollView, float scaleExtent) { // Scale Constraint - Constraint constraint = Constraint::New( Actor::SCALE, - LocalSource(Actor::POSITION), - ParentSource(Actor::POSITION), + Constraint constraint = Constraint::New( Actor::Property::SCALE, + LocalSource(Actor::Property::POSITION), + ParentSource(Actor::Property::POSITION), Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ), Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_MIN_PROPERTY_NAME ) ), Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_MAX_PROPERTY_NAME ) ), - Source(scrollView, Actor::SIZE ), + Source(scrollView, Actor::Property::SIZE ), ScrollDepthScaleConstraint( positionExtent, offsetExtent, positionScale, scaleExtent ) ); constraint.SetRemoveAction( Constraint::Discard ); child.ApplyConstraint( constraint ); // Position Constraint (apply last as other constraints use Actor::POSITION as a function input) - constraint = Constraint::New( Actor::POSITION, - ParentSource(Actor::POSITION), + constraint = Constraint::New( Actor::Property::POSITION, + ParentSource(Actor::Property::POSITION), Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ), Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_MIN_PROPERTY_NAME ) ), Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_MAX_PROPERTY_NAME ) ), - Source(scrollView, Actor::SIZE ), + Source(scrollView, Actor::Property::SIZE ), Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_WRAP_PROPERTY_NAME ) ), ScrollDepthPositionConstraint( positionExtent, offsetExtent, positionScale ) );