X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-carousel-effect-impl.cpp;h=3758e07b20ece71c5a1a48e641580507959f30b7;hp=8a1cdba26898a239c27d8f031821b5d3909c0136;hb=8fef10ea440a32a1536b485dc7a035f9defa537c;hpb=60309eac2e559fe0226f137d81c2bdfa157f15dc diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp index 8a1cdba..3758e07 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-carousel-effect-impl.cpp @@ -230,33 +230,33 @@ void ApplyScrollCarouselConstraints(Toolkit::ScrollView scrollView, // Apply constraints to this actor // Constraint constraint; - constraint = Constraint::New( Actor::Property::Visible, - LocalSource( Actor::Property::Position ), - LocalSource( Actor::Property::Scale ), - LocalSource( Actor::Property::Size ), + constraint = Constraint::New( Actor::Property::VISIBLE, + LocalSource( Actor::Property::POSITION ), + LocalSource( Actor::Property::SCALE ), + LocalSource( Actor::Property::SIZE ), Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ), - Source(scrollView, Actor::Property::Size ), + Source(scrollView, Actor::Property::SIZE ), Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollViewCarouselEffect::EFFECT_ACTIVATE ) ), boost::bind( &ScrollCarouselEffectInfo::VisibilityConstraint, info, _1, _2, _3, _4, _5, _6) ); constraint.SetRemoveAction( Constraint::Discard ); child.ApplyConstraint( constraint ); - constraint = Constraint::New( Actor::Property::Rotation, - LocalSource( Actor::Property::Position ), - LocalSource( Actor::Property::Scale ), - LocalSource( Actor::Property::Size ), + constraint = Constraint::New( Actor::Property::ROTATION, + LocalSource( Actor::Property::POSITION ), + LocalSource( Actor::Property::SCALE ), + LocalSource( Actor::Property::SIZE ), Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ), - Source(scrollView, Actor::Property::Size ), + Source(scrollView, Actor::Property::SIZE ), Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollViewCarouselEffect::EFFECT_ACTIVATE ) ), boost::bind( &ScrollCarouselEffectInfo::RotationConstraint, info, _1, _2, _3, _4, _5, _6, _7) ); constraint.SetRemoveAction( Constraint::Discard ); child.ApplyConstraint( constraint ); - constraint = Constraint::New( Actor::Property::Position, - LocalSource( Actor::Property::Scale ), - LocalSource( Actor::Property::Size ), + constraint = Constraint::New( Actor::Property::POSITION, + LocalSource( Actor::Property::SCALE ), + LocalSource( Actor::Property::SIZE ), Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ), - Source(scrollView, Actor::Property::Size ), + Source(scrollView, Actor::Property::SIZE ), Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollViewCarouselEffect::EFFECT_ACTIVATE ) ), boost::bind( &ScrollCarouselEffectInfo::PositionConstraint, info, _1, _2, _3, _4, _5, _6) );