// EXTERNAL INCLUDES
#include <algorithm>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/set-wrapper.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/events/mouse-wheel-event.h>
+#include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/object/type-registry.h>
// INTERNAL INCLUDES
-#include <dali/public-api/events/mouse-wheel-event.h>
#include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
#include <dali-toolkit/internal/controls/scrollable/scroll-connector-impl.h>
#include <dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h>
-using namespace std;
+using std::string;
+using std::set;
using namespace Dali;
namespace // unnamed namespace
const float DEFAULT_MINIMUM_SWIPE_DISTANCE = 3.0f;
const float DEFAULT_MOUSE_WHEEL_SCROLL_DISTANCE_STEP_PROPORTION = 0.1f;
+const float DEFAULT_MINIMUM_SWIPE_DURATION = 0.45f;
+const float DEFAULT_MAXIMUM_SWIPE_DURATION = 2.6f;
+
const float DEFAULT_REFRESH_INTERVAL_LAYOUT_POSITIONS = 20.0f; // 1 updates per 20 items
const int MOUSE_WHEEL_EVENT_FINISHED_TIME_OUT = 500; // 0.5 second
const float DEFAULT_ANCHORING_DURATION = 1.0f; // 1 second
-const float DEFAULT_COLOR_VISIBILITY_REMOVE_TIME = 0.5f; // 0.5 second
const float MILLISECONDS_PER_SECONDS = 1000.0f;
const string SCROLL_DIRECTION_PROPERTY_NAME( "item-view-scroll-direction" );
const string OVERSHOOT_PROPERTY_NAME( "item-view-overshoot" );
-// Functors which wrap constraint functions with stored item IDs
-
-struct WrappedVector3Constraint
-{
- WrappedVector3Constraint(Toolkit::ItemLayout::Vector3Function wrapMe, unsigned int itemId)
- : mWrapMe(wrapMe),
- mItemId(itemId)
- {
- }
-
- Vector3 operator()(const Vector3& current, const PropertyInput& layoutPosition, const PropertyInput& scrollSpeed, const PropertyInput& layoutSize)
- {
- float offsetLayoutPosition = layoutPosition.GetFloat() + static_cast<float>(mItemId);
-
- return mWrapMe(current, offsetLayoutPosition, scrollSpeed.GetFloat(), layoutSize.GetVector3());
- }
-
- Toolkit::ItemLayout::Vector3Function mWrapMe;
- unsigned int mItemId;
-};
-
-struct WrappedQuaternionConstraint
-{
- WrappedQuaternionConstraint(Toolkit::ItemLayout::QuaternionFunction wrapMe, unsigned int itemId)
- : mWrapMe(wrapMe),
- mItemId(itemId)
- {
- }
-
- Quaternion operator()(const Quaternion& current, const PropertyInput& layoutPosition, const PropertyInput& scrollSpeed, const PropertyInput& layoutSize)
- {
- float offsetLayoutPosition = layoutPosition.GetFloat() + static_cast<float>(mItemId);
-
- return mWrapMe(current, offsetLayoutPosition, scrollSpeed.GetFloat(), layoutSize.GetVector3());
- }
-
- Toolkit::ItemLayout::QuaternionFunction mWrapMe;
- unsigned int mItemId;
-};
-
-struct WrappedVector4Constraint
-{
- WrappedVector4Constraint(Toolkit::ItemLayout::Vector4Function wrapMe, unsigned int itemId)
- : mWrapMe(wrapMe),
- mItemId(itemId)
- {
- }
-
- Vector4 operator()(const Vector4& current, const PropertyInput& layoutPosition, const PropertyInput& scrollSpeed, const PropertyInput& layoutSize)
- {
- float offsetLayoutPosition = layoutPosition.GetFloat() + static_cast<float>(mItemId);
-
- return mWrapMe(current, offsetLayoutPosition, scrollSpeed.GetFloat(), layoutSize.GetVector3());
- }
-
- Toolkit::ItemLayout::Vector4Function mWrapMe;
- unsigned int mItemId;
-};
-
-struct WrappedBoolConstraint
-{
- WrappedBoolConstraint(Toolkit::ItemLayout::BoolFunction wrapMe, unsigned int itemId)
- : mWrapMe(wrapMe),
- mItemId(itemId)
- {
- }
-
- bool operator()(const bool& current, const PropertyInput& layoutPosition, const PropertyInput& scrollSpeed, const PropertyInput& layoutSize)
- {
- float offsetLayoutPosition = layoutPosition.GetFloat() + static_cast<float>(mItemId);
-
- return mWrapMe(current, offsetLayoutPosition, scrollSpeed.GetFloat(), layoutSize.GetVector3());
- }
-
- Toolkit::ItemLayout::BoolFunction mWrapMe;
- unsigned int mItemId;
-};
-
/**
* Local helper to convert pan distance (in actor coordinates) to the layout-specific scrolling direction
*/
: Scrollable(),
mItemFactory(factory),
mActiveLayout(NULL),
- mDefaultAlphaFunction(Dali::Constraint::DEFAULT_ALPHA_FUNCTION),
mAnimatingOvershootOn(false),
mAnimateOvershootOff(false),
mAnchoringEnabled(true),
// Move the items to the new layout positions...
bool resizeAnimationNeeded(false);
-
for (ConstItemPoolIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter)
{
unsigned int itemId = iter->first;
}
}
- ApplyConstraints(actor, *mActiveLayout, itemId, durationSeconds);
+ mActiveLayout->ApplyConstraints(actor, itemId, durationSeconds, mScrollPositionObject, Self() );
}
if (resizeAnimationNeeded)
}
}
-void ItemView::SetDefaultAlphaFunction(AlphaFunction func)
-{
- mDefaultAlphaFunction = func;
-}
-
-AlphaFunction ItemView::GetDefaultAlphaFunction() const
-{
- return mDefaultAlphaFunction;
-}
-
void ItemView::OnRefreshNotification(PropertyNotification& source)
{
- if(mRefreshEnabled)
+ if(mRefreshEnabled || mScrollAnimation)
{
// Only refresh the cache during normal scrolling
DoRefresh(GetCurrentLayoutPosition(0), true);
moveMe = temp;
iter->second.RemoveConstraints();
- ApplyConstraints( iter->second, *mActiveLayout, iter->first, durationSeconds );
+ mActiveLayout->ApplyConstraints(iter->second, iter->first, durationSeconds, mScrollPositionObject, Self() );
}
// Create last item
mItemPool.insert( lastItem );
lastItem.second.RemoveConstraints();
- ApplyConstraints( lastItem.second, *mActiveLayout, lastItem.first, durationSeconds );
+ mActiveLayout->ApplyConstraints(lastItem.second, lastItem.first, durationSeconds, mScrollPositionObject, Self() );
}
else
{
mAddingItems = true;
// Insert from lowest id to highest
- set<Item> sortedItems;
+ std::set<Item> sortedItems;
for( ConstItemIter iter = newItems.begin(); newItems.end() != iter; ++iter )
{
sortedItems.insert( *iter );
}
- for( set<Item>::iterator iter = sortedItems.begin(); sortedItems.end() != iter; ++iter )
+ for( std::set<Item>::iterator iter = sortedItems.begin(); sortedItems.end() != iter; ++iter )
{
Self().Add( iter->second );
- cout << "inserting item: " << iter->first << endl;
-
ItemPoolIter foundIter = mItemPool.find( iter->first );
if( mItemPool.end() != foundIter )
{
else
{
iter->second.RemoveConstraints();
- ApplyConstraints( iter->second, *mActiveLayout, iter->first, durationSeconds );
+ mActiveLayout->ApplyConstraints( iter->second, iter->first, durationSeconds, mScrollPositionObject, Self() );
}
}
void ItemView::AddActorsWithinRange( ItemRange range, float durationSeconds )
{
- range.end = min(mItemFactory.GetNumberOfItems(), range.end);
+ range.end = std::min(mItemFactory.GetNumberOfItems(), range.end);
// The order of addition depends on the scroll direction.
if (mRefreshOrderHint)
item.second.SetSize( size );
}
- ApplyConstraints( item.second, *mActiveLayout, item.first, durationSeconds );
+ mActiveLayout->ApplyConstraints( item.second, item.first, durationSeconds, mScrollPositionObject, Self() );
}
}
mScrollOvershoot = 0.0f;
AnimateScrollOvershoot(0.0f);
- mScrollCompletedSignalV2.Emit(GetCurrentScrollPosition());
+ if(mScrollAnimation)
+ {
+ mScrollCompletedSignalV2.Emit(GetCurrentScrollPosition());
+ }
RemoveAnimation(mScrollAnimation);
}
return false;
}
-void ItemView::ApplyConstraints(Actor& actor, ItemLayout& layout, unsigned int itemId, float duration)
-{
- ItemLayout::Vector3Function positionConstraint;
- if (layout.GetPositionConstraint(itemId, positionConstraint))
- {
- WrappedVector3Constraint wrapped(positionConstraint, itemId);
-
- Constraint constraint = Constraint::New<Vector3>( Actor::POSITION,
- Source( mScrollPositionObject, ScrollConnector::SCROLL_POSITION ),
- ParentSource( mPropertyScrollSpeed ),
- ParentSource( Actor::SIZE ),
- wrapped );
- constraint.SetApplyTime(duration);
- constraint.SetAlphaFunction(mDefaultAlphaFunction);
-
- actor.ApplyConstraint(constraint);
- }
-
- ItemLayout::QuaternionFunction rotationConstraint;
- if (layout.GetRotationConstraint(itemId, rotationConstraint))
- {
- WrappedQuaternionConstraint wrapped(rotationConstraint, itemId);
-
- Constraint constraint = Constraint::New<Quaternion>( Actor::ROTATION,
- Source( mScrollPositionObject, ScrollConnector::SCROLL_POSITION ),
- ParentSource( mPropertyScrollSpeed ),
- ParentSource( Actor::SIZE ),
- wrapped );
- constraint.SetApplyTime(duration);
- constraint.SetAlphaFunction(mDefaultAlphaFunction);
-
- actor.ApplyConstraint(constraint);
- }
-
- ItemLayout::Vector3Function scaleConstraint;
- if (layout.GetScaleConstraint(itemId, scaleConstraint))
- {
- WrappedVector3Constraint wrapped(scaleConstraint, itemId);
-
- Constraint constraint = Constraint::New<Vector3>( Actor::SCALE,
- Source( mScrollPositionObject, ScrollConnector::SCROLL_POSITION ),
- ParentSource( mPropertyScrollSpeed ),
- ParentSource( Actor::SIZE ),
- wrapped );
- constraint.SetApplyTime(duration);
- constraint.SetAlphaFunction(mDefaultAlphaFunction);
-
- actor.ApplyConstraint(constraint);
- }
-
- ItemLayout::Vector4Function colorConstraint;
- if (layout.GetColorConstraint(itemId, colorConstraint))
- {
- WrappedVector4Constraint wrapped(colorConstraint, itemId);
-
- Constraint constraint = Constraint::New<Vector4>( Actor::COLOR,
- Source( mScrollPositionObject, ScrollConnector::SCROLL_POSITION ),
- ParentSource( mPropertyScrollSpeed ),
- ParentSource( Actor::SIZE ),
- wrapped );
- constraint.SetApplyTime(duration);
- constraint.SetAlphaFunction(mDefaultAlphaFunction);
-
- // Release color constraints slowly; this allows ItemView to co-exist with ImageActor fade-in
- constraint.SetRemoveTime(DEFAULT_COLOR_VISIBILITY_REMOVE_TIME);
- constraint.SetRemoveAction(Dali::Constraint::Discard);
-
- actor.ApplyConstraint(constraint);
- }
-
- ItemLayout::BoolFunction visibilityConstraint;
- if (layout.GetVisibilityConstraint(itemId, visibilityConstraint))
- {
- WrappedBoolConstraint wrapped(visibilityConstraint, itemId);
-
- Constraint constraint = Constraint::New<bool>( Actor::VISIBLE,
- Source( mScrollPositionObject, ScrollConnector::SCROLL_POSITION ),
- ParentSource( mPropertyScrollSpeed ),
- ParentSource( Actor::SIZE ),
- wrapped );
- constraint.SetApplyTime(duration);
- constraint.SetAlphaFunction(mDefaultAlphaFunction);
-
- // Release visibility constraints the same time as the color constraint
- constraint.SetRemoveTime(DEFAULT_COLOR_VISIBILITY_REMOVE_TIME);
- constraint.SetRemoveAction(Dali::Constraint::Discard);
-
- actor.ApplyConstraint(constraint);
- }
-}
-
void ItemView::ReapplyAllConstraints( float durationSeconds )
{
for (ConstItemPoolIter iter = mItemPool.begin(); iter != mItemPool.end(); ++iter)
Actor actor = iter->second;
actor.RemoveConstraints();
- ApplyConstraints(actor, *mActiveLayout, id, durationSeconds);
+ mActiveLayout->ApplyConstraints(actor, id, durationSeconds, mScrollPositionObject, Self());
}
CalculateDomainSize(Self().GetCurrentSize());
{
Actor self = Self();
float minLayoutPosition = layout.GetMinimumLayoutPosition(mItemFactory.GetNumberOfItems(), targetSize);
- float clamppedPosition = min(0.0f, max(minLayoutPosition, targetPosition));
+ float clamppedPosition = std::min(0.0f, std::max(minLayoutPosition, targetPosition));
mScrollOvershoot = targetPosition - clamppedPosition;
self.SetProperty(mPropertyMinimumLayoutPosition, minLayoutPosition);
RemoveAnimation(mScrollAnimation);
- float flickAnimationDuration = mActiveLayout->GetItemFlickAnimationDuration() * max(1.0f, fabsf(firstItemScrollPosition - GetCurrentLayoutPosition(0)));
+ float flickAnimationDuration = Clamp( mActiveLayout->GetItemFlickAnimationDuration() * std::max(1.0f, fabsf(firstItemScrollPosition - GetCurrentLayoutPosition(0)))
+ , DEFAULT_MINIMUM_SWIPE_DURATION, DEFAULT_MAXIMUM_SWIPE_DURATION);
+
mScrollAnimation = Animation::New(flickAnimationDuration);
mScrollAnimation.AnimateTo( Property( mScrollPositionObject, ScrollConnector::SCROLL_POSITION ), firstItemScrollPosition, AlphaFunctions::EaseOut );
mScrollAnimation.AnimateTo( Property(self, mPropertyPosition), GetScrollPosition(firstItemScrollPosition, layoutSize), AlphaFunctions::EaseOut );
case Gesture::Continuing:
{
mScrollDistance = CalculateScrollDistance(gesture.displacement, *mActiveLayout);
- mScrollSpeed = Clamp((gesture.GetSpeed() * mActiveLayout->GetFlickSpeedFactor() * MILLISECONDS_PER_SECONDS), 0.0f, mActiveLayout->GetMaximumSwipeSpeed());
+ mScrollSpeed = Clamp((gesture.GetSpeed() * gesture.GetSpeed() * mActiveLayout->GetFlickSpeedFactor() * MILLISECONDS_PER_SECONDS), 0.0f, mActiveLayout->GetMaximumSwipeSpeed());
// Refresh order depends on the direction of the scroll; negative is towards the last item.
mRefreshOrderHint = mScrollDistance < 0.0f;
int nextItemID = GetItemId(commitedFocusableActor);
float layoutPosition = GetCurrentLayoutPosition(0);
Vector3 layoutSize = Self().GetCurrentSize();
- Vector3 focusItemPosition = Vector3::ZERO;
- ItemLayout::Vector3Function itemPositionConstraint;
- if (mActiveLayout->GetPositionConstraint(nextItemID, itemPositionConstraint))
- {
- focusItemPosition = itemPositionConstraint(Vector3::ZERO, layoutPosition + nextItemID, 0.0f, layoutSize);
- }
float scrollTo = mActiveLayout->GetClosestOnScreenLayoutPosition(nextItemID, layoutPosition, layoutSize);
ScrollTo(Vector3(0.0f, scrollTo, 0.0f), DEFAULT_KEYBOARD_FOCUS_SCROLL_DURATION);
void ItemView::OnLayoutActivationScrollFinished(Animation& source)
{
+ RemoveAnimation(mScrollAnimation);
mRefreshEnabled = true;
DoRefresh(GetCurrentLayoutPosition(0), true);
}
if(mActiveLayout)
{
- ItemLayout::Vector3Function firstItemPositionConstraint;
- if (mActiveLayout->GetPositionConstraint(0, firstItemPositionConstraint))
- {
- firstItemPosition = firstItemPositionConstraint(Vector3::ZERO, 0, 0.0f, layoutSize);
- }
+ firstItemPosition = mActiveLayout->GetItemPosition( 0,0,layoutSize );
float minLayoutPosition = mActiveLayout->GetMinimumLayoutPosition(mItemFactory.GetNumberOfItems(), layoutSize);
self.SetProperty(mPropertyMinimumLayoutPosition, minLayoutPosition);
-
- ItemLayout::Vector3Function lastItemPositionConstraint;
- if (mActiveLayout->GetPositionConstraint(fabs(minLayoutPosition), lastItemPositionConstraint))
- {
- lastItemPosition = lastItemPositionConstraint(Vector3::ZERO, fabs(minLayoutPosition), 0.0f, layoutSize);
- }
+ lastItemPosition = mActiveLayout->GetItemPosition( fabs(minLayoutPosition),fabs(minLayoutPosition),layoutSize );
float domainSize;
float ItemView::GetScrollPosition(float layoutPosition, const Vector3& layoutSize) const
{
- Vector3 firstItemPosition(Vector3::ZERO);
- ItemLayout::Vector3Function firstItemPositionConstraint;
- if (mActiveLayout->GetPositionConstraint(0, firstItemPositionConstraint))
- {
- firstItemPosition = firstItemPositionConstraint(Vector3::ZERO, layoutPosition, 0.0f, layoutSize);
- }
-
+ Vector3 firstItemPosition( mActiveLayout->GetItemPosition(0, layoutPosition, layoutSize ) );
return IsHorizontal(mActiveLayout->GetOrientation()) ? firstItemPosition.x: firstItemPosition.y;
}
float positionDelta = GetCurrentLayoutPosition(0) + scrollDistance;
float minLayoutPosition = mActiveLayout->GetMinimumLayoutPosition(mItemFactory.GetNumberOfItems(), Self().GetCurrentSize());
self.SetProperty(mPropertyMinimumLayoutPosition, minLayoutPosition);
- float clamppedPosition = min(0.0f, max(minLayoutPosition, positionDelta));
+ float clamppedPosition = std::min(0.0f, std::max(minLayoutPosition, positionDelta));
overshoot = positionDelta - clamppedPosition;
}
projects / platform / core / uifw / dali-toolkit.git / blobdiff