-//
-// 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-carousel-effect-impl.h>
* move the Actor's edge visually away from the neighboring actor, as they rotate
* around their default anchor point.
*/
-class ScrollCarouselEffectInfo : public Dali::RefObject
+class ScrollCarouselEffectInfo
{
public:
Vector2 mVisibilityThreshold; ///< Threshold for when to to switch off visibility of Actor (for performance)
};
-typedef IntrusivePtr<ScrollCarouselEffectInfo> ScrollCarouselEffectInfoPtr;
-
/**
* Helper: Applies the 3D scroll carousel constraints to the child actor
*
*/
void ApplyScrollCarouselConstraints(Toolkit::ScrollView scrollView,
Actor child,
- ScrollCarouselEffectInfoPtr info)
+ ScrollCarouselEffectInfo& info)
{
// Apply constraints to this actor //
Constraint constraint;
- constraint = Constraint::New<bool>( Actor::VISIBLE,
- LocalSource( Actor::POSITION ),
- LocalSource( Actor::SCALE ),
- LocalSource( Actor::SIZE ),
+ constraint = Constraint::New<bool>( 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::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<Quaternion>( Actor::ROTATION,
- LocalSource( Actor::POSITION ),
- LocalSource( Actor::SCALE ),
- LocalSource( Actor::SIZE ),
+ constraint = Constraint::New<Quaternion>( Actor::Property::ORIENTATION,
+ 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::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<Vector3>( Actor::POSITION,
- LocalSource( Actor::SCALE ),
- LocalSource( Actor::SIZE ),
+ constraint = Constraint::New<Vector3>( Actor::Property::POSITION,
+ LocalSource( Actor::Property::SCALE ),
+ LocalSource( Actor::Property::SIZE ),
Source(scrollView, scrollView.GetPropertyIndex( Toolkit::ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ),
- Source(scrollView, Actor::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) );
void ScrollViewCarouselEffect::ApplyToActor(Actor child, const Vector2& angleSwing)
{
- ScrollCarouselEffectInfoPtr info(new ScrollCarouselEffectInfo(angleSwing));
+ ScrollCarouselEffectInfo info( angleSwing );
ApplyScrollCarouselConstraints( GetScrollView(), child, info );
}