{
const int DEFAULT_REFRESH_INTERVAL_MILLISECONDS = 50; ///< Refresh rate TODO: Animation should have an update signal (and see item-view-impl)
-const float FLICK_SPEED_THRESHOLD = 500.0f; ///< Flick threshold in pixels/ms
+const Vector2 DEFAULT_MIN_FLICK_DISTANCE(30.0f, 30.0f); ///< minimum distance for pan before flick allowed
+const float DEFAULT_MIN_FLICK_SPEED_THRESHOLD(500.0f); ///< Minimum pan speed required for flick in pixels/s
const float FREE_FLICK_SPEED_THRESHOLD = 200.0f; ///< Free-Flick threshold in pixels/ms
const float AUTOLOCK_AXIS_MINIMUM_DISTANCE2 = 100.0f; ///< Auto-lock axis after minimum distance squared.
const float FLICK_ORTHO_ANGLE_RANGE = 75.0f; ///< degrees. (if >45, then supports diagonal flicking)
mSnapOvershootAlphaFunction(AlphaFunctions::EaseOut),
mSnapDuration(Toolkit::ScrollView::DEFAULT_SLOW_SNAP_ANIMATION_DURATION),
mSnapAlphaFunction(AlphaFunctions::EaseOut),
+ mMinFlickDistance(DEFAULT_MIN_FLICK_DISTANCE),
+ mFlickSpeedThreshold(DEFAULT_MIN_FLICK_SPEED_THRESHOLD),
mFlickDuration(Toolkit::ScrollView::DEFAULT_FAST_SNAP_ANIMATION_DURATION),
mFlickAlphaFunction(AlphaFunctions::EaseOut),
mAxisAutoLockGradient(Toolkit::ScrollView::DEFAULT_AXIS_AUTO_LOCK_GRADIENT),
mFlickSpeedCoefficient = speed;
}
+Vector2 ScrollView::GetMinimumDistanceForFlick() const
+{
+ return mMinFlickDistance;
+}
+
+void ScrollView::SetMinimumDistanceForFlick( const Vector2& distance )
+{
+ mMinFlickDistance = distance;
+}
+
+float ScrollView::GetMinimumSpeedForFlick() const
+{
+ return mFlickSpeedThreshold;
+}
+
+void ScrollView::SetMinimumSpeedForFlick( float speed )
+{
+ mFlickSpeedThreshold = speed;
+}
+
float ScrollView::GetMaxFlickSpeed() const
{
return mMaxFlickSpeed;
// that will be accepted as a general N,E,S,W flick direction.
const float orthoAngleRange = FLICK_ORTHO_ANGLE_RANGE * M_PI / 180.0f;
- const float flickSpeedThreshold2 = FLICK_SPEED_THRESHOLD*FLICK_SPEED_THRESHOLD;
+ const float flickSpeedThreshold2 = mFlickSpeedThreshold * mFlickSpeedThreshold;
Vector3 positionSnap = mScrollPrePosition;
mGestureStackDepth--;
if(mGestureStackDepth==0)
{
+ // no flick if we have not exceeded min flick distance
+ if( (fabsf(mPanDelta.x) < mMinFlickDistance.x)
+ && (fabsf(mPanDelta.y) < mMinFlickDistance.y) )
+ {
+ // reset flick velocity
+ mLastVelocity = Vector2::ZERO;
+ }
FinishTransform();
}
else
PreAnimatedScrollSetup();
+ // convert pixels/millisecond to pixels per second
bool animating = SnapWithVelocity(mLastVelocity * 1000.0f);
if(!animating)
void SetFlickSpeedCoefficient(float speed);
/**
+ * @copydoc Toolkit::ScrollView::GetMinimumDistanceForFlick
+ */
+ Vector2 GetMinimumDistanceForFlick() const;
+
+ /**
+ * @copydoc Toolkit::ScrollView::SetMinimumDistanceForFlick
+ */
+ void SetMinimumDistanceForFlick( const Vector2& distance );
+
+ /**
+ * @copydoc Toolkit::ScrollView::GetMinimumSpeedForFlick
+ */
+ float GetMinimumSpeedForFlick() const;
+
+ /**
+ * @copydoc Toolkit::ScrollView::SetMinimumSpeedForFlick
+ */
+ void SetMinimumSpeedForFlick( float speed );
+
+ /**
* @copydoc Toolkit::ScrollView::GetMaxFlickSpeed
*/
float GetMaxFlickSpeed() const;
float mSnapDuration; ///< Time for the snap animation to take (in seconds).
AlphaFunction mSnapAlphaFunction; ///< AlphaFunction to be used for the Snap Animation.
+ Vector2 mMinFlickDistance; ///< Minimum pan distance required for a flick
+ float mFlickSpeedThreshold; ///< Minimum pan speed required for a flick in pixels/ms
float mFlickDuration; ///< Time for the flick animation to take (in seconds).
AlphaFunction mFlickAlphaFunction; ///< AlphaFunction to be used for the Flick Animation.
GetImpl(*this).SetFlickSpeedCoefficient(speed);
}
+Vector2 ScrollView::GetMinimumDistanceForFlick() const
+{
+ return GetImpl(*this).GetMinimumDistanceForFlick();
+}
+
+void ScrollView::SetMinimumDistanceForFlick( const Vector2& distance )
+{
+ GetImpl(*this).SetMinimumDistanceForFlick(distance);
+}
+
+float ScrollView::GetMinimumSpeedForFlick() const
+{
+ return GetImpl(*this).GetMinimumSpeedForFlick();
+}
+
+void ScrollView::SetMinimumSpeedForFlick( float speed )
+{
+ GetImpl(*this).SetMinimumSpeedForFlick(speed);
+}
+
float ScrollView::GetMaxFlickSpeed() const
{
return GetImpl(*this).GetMaxFlickSpeed();
void SetFlickSpeedCoefficient(float speed);
/**
+ * @brief Returns the minimum pan distance required for a flick gesture in pixels
+ *
+ * @return Minimum pan distance vector with separate x and y distance
+ */
+ Vector2 GetMinimumDistanceForFlick() const;
+
+ /**
+ * @brief Sets the minimum pan distance required for a flick in pixels
+ *
+ * Takes a Vector2 containing separate x and y values. As long as the pan distance exceeds one of these axes a flick will be allowed
+ *
+ * @param[in] distance The minimum pan distance for a flick
+ */
+ void SetMinimumDistanceForFlick( const Vector2& distance );
+
+ /**
+ * @brief Returns the minimum pan speed required for a flick gesture in pixels per second
+ *
+ * @return Minimum pan speed
+ */
+ float GetMinimumSpeedForFlick() const;
+
+ /**
+ * @brief Sets the minimum pan speed required for a flick in pixels per second
+ *
+ * @param[in] speed The minimum pan speed for a flick
+ */
+ void SetMinimumSpeedForFlick( float speed );
+
+ /**
* @brief Gets the maximum flick speed setting for ScrollView when
* flicking in free panning mode.
*