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-page-cube-effect-impl.cpp;h=c65d4f37f176f4794c64a715db917091fbe327cf;hp=483e0bd30158e1e7c4607f94b9d8ae9579511928;hb=6e824d3bfb11cab305d0d8375b202076d59222b0;hpb=8fef10ea440a32a1536b485dc7a035f9defa537c diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp index 483e0bd..c65d4f3 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-cube-effect-impl.cpp @@ -71,11 +71,11 @@ public: /** * @param[in] current The current orientation of this Actor * @param[in] pagePositionProperty The page's position. - * @param[in] scrollPositionProperty The scroll-view's position property (SCROLL_POSITION_PROPERTY_NAME) - * @param[in] scrollPositionMin The minimum extent of this scroll domain. (SCROLL_POSITION_MIN_PROPERTY_NAME) - * @param[in] scrollPositionMax The maximum extent of this scroll domain. (SCROLL_POSITION_MIN_PROPERTY_NAME) + * @param[in] scrollPositionProperty The scroll-view's position property (SCROLL_POSITION) + * @param[in] scrollPositionMin The minimum extent of this scroll domain. (SCROLL_POSITION_MIN) + * @param[in] scrollPositionMax The maximum extent of this scroll domain. (SCROLL_POSITION_MAX) * @param[in] pageSizeProperty The size of the page. (scrollView SIZE) - * @param[in] scrollWrap Whether scroll wrap has been enabled or not (SCROLL_WRAP_PROPERTY_NAME) + * @param[in] scrollWrap Whether scroll wrap has been enabled or not (WRAP) * @return The new orientation of this Actor. */ Quaternion RotationConstraint(const Quaternion& current, @@ -125,11 +125,11 @@ public: /** * @param[in] current The current color of this Actor * @param[in] pagePositionProperty The page's position. - * @param[in] scrollPositionProperty The scroll-view's position property (SCROLL_POSITION_PROPERTY_NAME) - * @param[in] scrollPositionMin The minimum extent of this scroll domain. (SCROLL_POSITION_MIN_PROPERTY_NAME) - * @param[in] scrollPositionMax The maximum extent of this scroll domain. (SCROLL_POSITION_MIN_PROPERTY_NAME) + * @param[in] scrollPositionProperty The scroll-view's position property (SCROLL_POSITION) + * @param[in] scrollPositionMin The minimum extent of this scroll domain. (SCROLL_POSITION_MIN) + * @param[in] scrollPositionMax The maximum extent of this scroll domain. (SCROLL_POSITION_MAX) * @param[in] pageSizeProperty The size of the page. (scrollView SIZE) - * @param[in] scrollWrap Whether scroll wrap has been enabled or not (SCROLL_WRAP_PROPERTY_NAME) + * @param[in] scrollWrap Whether scroll wrap has been enabled or not (WRAP) * @return The new color of this Actor. */ Vector4 ColorConstraint(const Vector4& current, @@ -185,11 +185,11 @@ public: /** * @param[in] current The current position * @param[in] pagePositionProperty The page's position. - * @param[in] scrollPositionProperty The scroll-view's position property (SCROLL_POSITION_PROPERTY_NAME) - * @param[in] scrollPositionMin The minimum extent of this scroll domain. (SCROLL_POSITION_MIN_PROPERTY_NAME) - * @param[in] scrollPositionMax The maximum extent of this scroll domain. (SCROLL_POSITION_MIN_PROPERTY_NAME) + * @param[in] scrollPositionProperty The scroll-view's position property (SCROLL_POSITION) + * @param[in] scrollPositionMin The minimum extent of this scroll domain. (SCROLL_POSITION_MIN) + * @param[in] scrollPositionMax The maximum extent of this scroll domain. (SCROLL_POSITION_MAX) * @param[in] pageSizeProperty The size of the page. (scrollView SIZE) - * @param[in] scrollWrap Whether scroll wrap has been enabled or not (SCROLL_WRAP_PROPERTY_NAME) + * @param[in] scrollWrap Whether scroll wrap has been enabled or not (WRAP) * @return The new position of this Actor. */ Vector3 PositionConstraint(const Vector3& current, @@ -259,13 +259,13 @@ void ApplyScrollCubeConstraints(Toolkit::ScrollView scrollView, { // Apply constraints to this actor // Constraint constraint; - constraint = Constraint::New( Actor::Property::ROTATION, + constraint = Constraint::New( Actor::Property::ORIENTATION, LocalSource(Actor::Property::POSITION), - Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_FINAL_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, Toolkit::ScrollView::Property::SCROLL_FINAL ), + Source(scrollView, Toolkit::Scrollable::Property::SCROLL_POSITION_MIN ), + Source(scrollView, Toolkit::Scrollable::Property::SCROLL_POSITION_MAX ), Source(scrollView, Actor::Property::SIZE ), - Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_WRAP_PROPERTY_NAME ) ), + Source(scrollView, Toolkit::ScrollView::Property::WRAP ), boost::bind( &ScrollPageCubeEffectInfo::RotationConstraint, info, _1, _2, _3, _4, _5, _6, _7) ); constraint.SetRemoveAction( Constraint::Discard ); @@ -273,11 +273,11 @@ void ApplyScrollCubeConstraints(Toolkit::ScrollView scrollView, constraint = Constraint::New( Actor::Property::COLOR, LocalSource(Actor::Property::POSITION), - Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_FINAL_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, Toolkit::ScrollView::Property::SCROLL_FINAL ), + Source(scrollView, Toolkit::Scrollable::Property::SCROLL_POSITION_MIN ), + Source(scrollView, Toolkit::Scrollable::Property::SCROLL_POSITION_MAX ), Source(scrollView, Actor::Property::SIZE ), - Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_WRAP_PROPERTY_NAME ) ), + Source(scrollView, Toolkit::ScrollView::Property::WRAP ), boost::bind( &ScrollPageCubeEffectInfo::ColorConstraint, info, _1, _2, _3, _4, _5, _6, _7) ); constraint.SetRemoveAction( Constraint::Discard ); @@ -285,11 +285,11 @@ void ApplyScrollCubeConstraints(Toolkit::ScrollView scrollView, constraint = Constraint::New( Actor::Property::POSITION, LocalSource(Actor::Property::POSITION), - Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_FINAL_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, Toolkit::ScrollView::Property::SCROLL_FINAL ), + Source(scrollView, Toolkit::Scrollable::Property::SCROLL_POSITION_MIN ), + Source(scrollView, Toolkit::Scrollable::Property::SCROLL_POSITION_MAX ), Source(scrollView, Actor::Property::SIZE ), - Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_WRAP_PROPERTY_NAME ) ), + Source(scrollView, Toolkit::ScrollView::Property::WRAP ), boost::bind( &ScrollPageCubeEffectInfo::PositionConstraint, info, _1, _2, _3, _4, _5, _6, _7) ); constraint.SetRemoveAction( Constraint::Discard );