X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fitem-view%2Fitem-layout.cpp;h=0dc2bb4788a14f45825c5726a3ec8179af185759;hp=6b570ccf57fc15735d3fbf9a3927852205109fc6;hb=a78bb823aebc305823855ac35b3413aaff7bc684;hpb=6843654a76dd5ac486ec3dc69e32798023dda176 diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp index 6b570cc..0dc2bb4 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp @@ -26,156 +26,55 @@ // INTERNAL INCLUDES #include -namespace -{ - -// Lerps between initial and target using the progress -template< typename Type > -void Lerp( Type& current, const Type& initial, const Type& target, float progress ) -{ - current = initial + ((target - initial) * progress); -} - -// Functors which wrap constraint functions with stored item IDs -struct WrappedQuaternionConstraint -{ - WrappedQuaternionConstraint( Dali::Toolkit::ItemLayout::QuaternionFunction wrapMe, unsigned int itemId ) - :mWrapMe(wrapMe), - mItemId(itemId), - mInitialised( false ) - { - } - - void operator()( Dali::Quaternion& current, const Dali::PropertyInputContainer& inputs ) - { - float offsetLayoutPosition = inputs[0]->GetFloat() + static_cast(mItemId); - float weight = inputs[3]->GetFloat(); - - if( !mInitialised ) - { - mInitialised = true; - mInitial = current; - } - - current = Dali::Quaternion::Slerp( mInitial, mWrapMe( current, offsetLayoutPosition, inputs[1]->GetFloat(), inputs[2]->GetVector3() ), weight ); - } - - Dali::Toolkit::ItemLayout::QuaternionFunction mWrapMe; - unsigned int mItemId; - Dali::Quaternion mInitial; - bool mInitialised:1; -}; - -struct WrappedVector3Constraint +namespace Dali { - WrappedVector3Constraint( Dali::Toolkit::ItemLayout::Vector3Function wrapMe, unsigned int itemId ) - : mWrapMe(wrapMe), - mItemId(itemId), - mInitial(), - mInitialised( false ) - { - } - - void operator()( Dali::Vector3& current, const Dali::PropertyInputContainer& inputs ) - { - float offsetLayoutPosition = inputs[0]->GetFloat() + static_cast(mItemId); - float weight = inputs[3]->GetFloat(); - - if( !mInitialised ) - { - mInitialised = true; - mInitial = current; - } - Lerp( current, mInitial, mWrapMe( current, offsetLayoutPosition, inputs[1]->GetFloat(), inputs[2]->GetVector3() ), weight ); - } - - Dali::Toolkit::ItemLayout::Vector3Function mWrapMe; - unsigned int mItemId; - Dali::Vector3 mInitial; - bool mInitialised:1; -}; - -struct WrappedVector4Constraint +namespace Toolkit { - WrappedVector4Constraint( Dali::Toolkit::ItemLayout::Vector4Function wrapMe, unsigned int itemId ) - : mWrapMe(wrapMe), - mItemId(itemId), - mInitial(), - mInitialised( false ) - { - } - - void operator()( Dali::Vector4& current, const Dali::PropertyInputContainer& inputs ) - { - float offsetLayoutPosition = inputs[0]->GetFloat() + static_cast(mItemId); - float weight = inputs[3]->GetFloat(); - - if( !mInitialised ) - { - mInitialised = true; - mInitial = current; - } - - Lerp( current, mInitial, mWrapMe( current, offsetLayoutPosition, inputs[1]->GetFloat(), inputs[2]->GetVector3() ), weight ); - } - Dali::Toolkit::ItemLayout::Vector4Function mWrapMe; - unsigned int mItemId; - Dali::Vector4 mInitial; - bool mInitialised:1; -}; - -struct WrappedBoolConstraint +struct ItemLayout::Impl { - WrappedBoolConstraint( Dali::Toolkit::ItemLayout::BoolFunction wrapMe, unsigned int itemId ) - : mWrapMe(wrapMe), - mItemId(itemId) - { - } - - void operator()( bool& current, const Dali::PropertyInputContainer& inputs ) - { - float weight = inputs[3]->GetFloat(); - - if ( weight >= 1.0f ) - { - float offsetLayoutPosition = inputs[0]->GetFloat() + static_cast(mItemId); - current = mWrapMe( current, offsetLayoutPosition, inputs[1]->GetFloat(), inputs[2]->GetVector3() ); - } - } - - Dali::Toolkit::ItemLayout::BoolFunction mWrapMe; - unsigned int mItemId; + Vector3 mItemSize; ///< The size of an item in the layout + ControlOrientation::Type mOrientation; ///< the orientation of the layout. }; -} //Unnamed namespace - -namespace Dali -{ - -namespace Toolkit -{ - ItemLayout::ItemLayout() -: mOrientation( ControlOrientation::Up ), - mAlphaFunction( AlphaFunction::LINEAR ), - mWeightObject() +: mImpl( new Impl ) { + mImpl->mOrientation = ControlOrientation::Up; } ItemLayout::~ItemLayout() { + delete mImpl; } void ItemLayout::SetOrientation(ControlOrientation::Type orientation) { - mOrientation = orientation; + mImpl->mOrientation = orientation; } ControlOrientation::Type ItemLayout::GetOrientation() const { - return mOrientation; + return mImpl->mOrientation; +} + +void ItemLayout::GetItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const +{ + // If item-size has not been set then get the default size + if ( mImpl->mItemSize == Vector3::ZERO ) + { + GetDefaultItemSize( itemId, layoutSize, itemSize ); + } + else + { + itemSize = mImpl->mItemSize; + } +} + +void ItemLayout::SetItemSize( const Vector3& itemSize ) +{ + mImpl->mItemSize = itemSize; } float ItemLayout::GetClosestOnScreenLayoutPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) @@ -196,12 +95,12 @@ float ItemLayout::GetClosestOnScreenLayoutPosition(int itemID, float currentLayo return currentLayoutPosition; } -int ItemLayout::GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled) +int ItemLayout::GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled) { switch( direction ) { - case Control::Left: - case Control::Up: + case Control::KeyboardFocus::LEFT: + case Control::KeyboardFocus::UP: { itemID--; if( itemID < 0 ) @@ -210,8 +109,8 @@ int ItemLayout::GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Cont } break; } - case Control::Right: - case Control::Down: + case Control::KeyboardFocus::RIGHT: + case Control::KeyboardFocus::DOWN: { itemID++; if( itemID >= maxItems ) @@ -230,125 +129,6 @@ float ItemLayout::GetFlickSpeedFactor() const return GetScrollSpeedFactor(); } -void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float durationSeconds, Handle scrollPositionObject, const Actor& itemViewActor ) -{ - // This just implements the default behaviour of constraint application. - // Custom layouts can override this function to apply their custom constraints. - Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::DownCast( itemViewActor ); - if(itemView && scrollPositionObject) - { - Property::Index scrollSpeedProperty = itemView.GetPropertyIndex("item-view-scroll-speed"); - Property::Index scrollPositionProperty = scrollPositionObject.GetPropertyIndex("scroll-position"); - - // We want to animate the layout in so use a weight object to do this - if ( !mWeightObject ) - { - mWeightObject = WeightObject::New(); - } - - ItemLayout::Vector3Function positionConstraint; - if (GetPositionConstraint(itemId, positionConstraint)) - { - WrappedVector3Constraint wrapped(positionConstraint, itemId); - Constraint constraint = Constraint::New( actor, Actor::Property::POSITION, wrapped ); - constraint.AddSource( Source( scrollPositionObject, scrollPositionProperty ) ); - constraint.AddSource( ParentSource( scrollSpeedProperty ) ); - constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.AddSource( Source( mWeightObject, WeightObject::WEIGHT ) ); - constraint.Apply(); - } - - ItemLayout::QuaternionFunction rotationConstraint; - if (GetRotationConstraint(itemId, rotationConstraint)) - { - WrappedQuaternionConstraint wrapped(rotationConstraint, itemId); - - Constraint constraint = Constraint::New( actor, Actor::Property::ORIENTATION, wrapped ); - constraint.AddSource( Source( scrollPositionObject, scrollPositionProperty ) ); - constraint.AddSource( ParentSource( scrollSpeedProperty ) ); - constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.AddSource( Source( mWeightObject, WeightObject::WEIGHT ) ); - constraint.Apply(); - } - - ItemLayout::Vector3Function scaleConstraint; - if (GetScaleConstraint(itemId, scaleConstraint)) - { - WrappedVector3Constraint wrapped(scaleConstraint, itemId); - - Constraint constraint = Constraint::New( actor, Actor::Property::SCALE, wrapped ); - constraint.AddSource( Source( scrollPositionObject, scrollPositionProperty ) ); - constraint.AddSource( ParentSource( scrollSpeedProperty ) ); - constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.AddSource( Source( mWeightObject, WeightObject::WEIGHT ) ); - constraint.Apply(); - } - - ItemLayout::Vector4Function colorConstraint; - if (GetColorConstraint(itemId, colorConstraint)) - { - WrappedVector4Constraint wrapped(colorConstraint, itemId); - - Constraint constraint = Constraint::New( actor, Actor::Property::COLOR, wrapped ); - constraint.AddSource( Source( scrollPositionObject, scrollPositionProperty ) ); - constraint.AddSource( ParentSource( scrollSpeedProperty ) ); - constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.AddSource( Source( mWeightObject, WeightObject::WEIGHT ) ); - constraint.SetRemoveAction(Dali::Constraint::Discard); - constraint.Apply(); - } - - ItemLayout::BoolFunction visibilityConstraint; - if (GetVisibilityConstraint(itemId, visibilityConstraint)) - { - WrappedBoolConstraint wrapped(visibilityConstraint, itemId); - - Constraint constraint = Constraint::New( actor, Actor::Property::VISIBLE, wrapped ); - constraint.AddSource( Source( scrollPositionObject, scrollPositionProperty ) ); - constraint.AddSource( ParentSource( scrollSpeedProperty ) ); - constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.AddSource( Source( mWeightObject, WeightObject::WEIGHT ) ); - - // Release visibility constraints the same time as the color constraint - constraint.SetRemoveAction(Dali::Constraint::Discard); - - constraint.Apply(); - } - - KeyFrames keyFrames = KeyFrames::New(); - keyFrames.Add( 0.0f, 0.0f ); - keyFrames.Add( 1.0f, 1.0f ); - - Animation applyAnimation = Dali::Animation::New( durationSeconds ); - applyAnimation.AnimateBetween( Property( mWeightObject, WeightObject::WEIGHT ), keyFrames, mAlphaFunction, TimePeriod(durationSeconds) ); - applyAnimation.Play(); - } -} - -Vector3 ItemLayout::GetItemPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) const -{ - Vector3 itemPosition = Vector3::ZERO; - - ItemLayout::Vector3Function positionConstraint; - if (GetPositionConstraint(itemID, positionConstraint)) - { - itemPosition = positionConstraint(Vector3::ZERO, currentLayoutPosition + itemID, 0.0f, layoutSize); - } - - return itemPosition; -} - -void ItemLayout::SetAlphaFunction(AlphaFunction func) -{ - mAlphaFunction = func; -} - -AlphaFunction ItemLayout::GetAlphaFunction() const -{ - return mAlphaFunction; -} - - } // namespace Toolkit } // namespace Dali