-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
// EXTERNAL INCLUDES
#include <boost/bind.hpp>
+#include <dali/public-api/animation/active-constraint.h>
+#include <dali/public-api/animation/constraint.h>
+#include <dali/public-api/object/property-input.h>
+// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h>
#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-cube-effect-impl.h>
* When at middle of the screen the position is not altered.
* When one screen away from middle the position is rotated about it's origin + mAnchor
*/
-class ScrollCubeEffectInfo : public Dali::RefObject
+class ScrollCubeEffectInfo
{
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,
/**
* @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,
/**
* @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,
Vector3 mPositionSwing; ///< Maximum amount in X and Y axes to alter position.
};
-typedef IntrusivePtr<ScrollCubeEffectInfo> ScrollCubeEffectInfoPtr;
-
/**
* Helper: Applies the 3D scroll cube constraints to the child actor
*
void ApplyScrollCubeConstraints(Toolkit::ScrollView scrollView,
Actor child,
Actor parentPage,
- ScrollCubeEffectInfoPtr info)
+ const ScrollCubeEffectInfo& info)
{
// Apply constraints to this actor //
Constraint constraint;
- constraint = Constraint::New<Quaternion>( Actor::ROTATION,
- Source(parentPage, Actor::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, Actor::SIZE ),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_WRAP_PROPERTY_NAME ) ),
+ constraint = Constraint::New<Quaternion>( Actor::Property::ORIENTATION,
+ Source(parentPage, Actor::Property::POSITION),
+ 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, Toolkit::ScrollView::Property::WRAP ),
boost::bind( &ScrollCubeEffectInfo::RotationConstraint, info, _1, _2, _3, _4, _5, _6, _7) );
constraint.SetRemoveAction( Constraint::Discard );
child.ApplyConstraint( constraint );
- constraint = Constraint::New<Vector4>( Actor::COLOR,
- Source(parentPage, Actor::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, Actor::SIZE ),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_WRAP_PROPERTY_NAME ) ),
+ constraint = Constraint::New<Vector4>( Actor::Property::COLOR,
+ Source(parentPage, Actor::Property::POSITION),
+ 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, Toolkit::ScrollView::Property::WRAP ),
boost::bind( &ScrollCubeEffectInfo::ColorConstraint, info, _1, _2, _3, _4, _5, _6, _7) );
constraint.SetRemoveAction( Constraint::Discard );
child.ApplyConstraint( constraint );
- constraint = Constraint::New<Vector3>( Actor::POSITION,
- Source(parentPage, Actor::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, Actor::SIZE ),
- Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_WRAP_PROPERTY_NAME ) ),
+ constraint = Constraint::New<Vector3>( Actor::Property::POSITION,
+ Source(parentPage, Actor::Property::POSITION),
+ 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, Toolkit::ScrollView::Property::WRAP ),
boost::bind( &ScrollCubeEffectInfo::PositionConstraint, info, _1, _2, _3, _4, _5, _6, _7) );
constraint.SetRemoveAction( Constraint::Discard );
const Vector2& angleSwing,
const Vector2& positionSwing)
{
- ScrollCubeEffectInfoPtr info(new ScrollCubeEffectInfo(anchor, angleSwing, positionSwing));
+ ScrollCubeEffectInfo info( anchor, angleSwing, positionSwing );
ApplyScrollCubeConstraints( GetScrollView(), child, child.GetParent(), info );
}
const Vector2& angleSwing,
const Vector2& positionSwing)
{
- ScrollCubeEffectInfoPtr info(new ScrollCubeEffectInfo(anchor, angleSwing, positionSwing));
+ ScrollCubeEffectInfo info( anchor, angleSwing, positionSwing );
ApplyScrollCubeConstraints( GetScrollView(), child, parentPage, info );
}
projects / platform / core / uifw / dali-toolkit.git / blobdiff