X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fitem-view%2Fitem-view-impl.h;h=5ae01124e66680f3faf19b6655734049742a61c9;hp=b6a2d963af107aca02683913fe0ce39eeeac53ee;hb=1f316c7e8f22f1ada38dfdff44d556205bb40ca4;hpb=a7646628bf0d87a7f9e02d8f4db52dea881579c7 diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h index b6a2d96..5ae0112 100644 --- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h +++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h @@ -216,11 +216,6 @@ public: void ReplaceItems(const ItemContainer& replacementItems, float durationSeconds); /** - * @copydoc Toolkit::Scrollable::GetDomainSize - */ - Vector2 GetDomainSize() const; - - /** * @copydoc Toolkit::Scrollable::GetCurrentScrollPosition */ Vector2 GetCurrentScrollPosition() const; @@ -308,6 +303,38 @@ public: */ static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ); + //properties + + /** + * Called when a property of an object of this type is set. + * @param[in] object The object whose property is set. + * @param[in] index The property index. + * @param[in] value The new property value. + */ + static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value ); + + /** + * Called to retrieve a property of an object of this type. + * @param[in] object The object whose property is to be retrieved. + * @param[in] index The property index. + * @return The current value of the property. + */ + static Property::Value GetProperty( BaseObject* object, Property::Index index ); + + /** + * Performs actions as requested using the action name. + * @param[in] object The object on which to perform the action. + * @param[in] actionName The action to perform. + * @param[in] attributes The attributes with which to perfrom this action. + * @return true if action has been accepted by this control + */ + static bool DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes ); + + /** + * Helper for DoAction( ACTION_STOP_SCROLLING ). + */ + void DoStopScrolling(); + private: /** @@ -360,13 +387,6 @@ private: // From CustomActorImpl virtual void OnChildAdd(Actor& child); /** - * From CustomActorImpl; called after a touch-signal is received by the owning actor. - * @param[in] event The touch event. - * @return True if the event should be consumed. - */ - virtual bool OnTouchEvent(const TouchEvent& event); - - /** * From CustomActorImpl; called after a wheel-event is received by the owning actor. * @param[in] event The wheel event. * @return True if the event should be consumed. @@ -452,21 +472,22 @@ private: // Input Handling /** - * Helper to handle pressed (Down) events. - * @param[in] x The X coordinate of the touch event. - * @param[in] y The Y coordinate of the touch event. - * @param[in] timeMs The time-stamp of the touch event. - */ - void OnPressed(float x, float y, unsigned long timeMs); - - /** * Helper to clamp the first-item position when dragging/swiping. * @param[in] targetPosition The target position of the drag etc. * @param[in] targetSize The target ItemView & layout size. * @param[in] layout The current layout. + * @param[in] updateOvershoot False stops the current overshoot value from being clamped also. * @return The clamped first-item position. */ - float ClampFirstItemPosition(float targetPosition, const Vector3& targetSize, ItemLayout& layout); + float ClampFirstItemPosition(float targetPosition, const Vector3& targetSize, ItemLayout& layout, bool updateOvershoot = true); + + /** + * Called after a touch-signal is received by the owning actor. + * @param[in] actor The touched actor. + * @param[in] touch The touch information. + * @return True if the event should be consumed. + */ + bool OnTouch( Actor actor, const TouchData& touch ); /** * Called upon pan gesture event. @@ -559,66 +580,46 @@ private: */ void OnRefreshNotification(PropertyNotification& source); - /** - * This is called when the change of scroll position is notified by ScrollBar. - * @param[in] position The new scroll position - */ - void OnScrollPositionChanged( float position ); - private: - ItemFactory& mItemFactory; - typedef std::map ItemPool; typedef ItemPool::iterator ItemPoolIter; typedef ItemPool::const_iterator ConstItemPoolIter; ItemPool mItemPool; - - std::vector< ItemLayoutPtr > mLayouts; ///< Container of Dali::Toolkit::ItemLayout objects - ItemLayout* mActiveLayout; - Vector3 mActiveLayoutTargetSize; - + ItemFactory& mItemFactory; + std::vector< ItemLayoutPtr > mLayouts; ///< Container of Dali::Toolkit::ItemLayout objects + Actor mOvershootOverlay; ///< The overlay actor for overshoot effect Animation mResizeAnimation; Animation mScrollAnimation; Animation mScrollOvershootAnimation; - bool mAnimatingOvershootOn; ///< whether we are currently animating overshoot to 1.0f/-1.0f (on) or to 0.0f (off) - bool mAnimateOvershootOff; ///< whether we are currently animating overshoot to 1.0f/-1.0f (on) or to 0.0f (off) + Timer mWheelEventFinishedTimer; ///< The timer to determine whether there is no wheel event received for a certain period of time. + PropertyNotification mRefreshNotification; ///< Stores the property notification used for item view refresh + LayoutActivatedSignalType mLayoutActivatedSignal; + Vector3 mActiveLayoutTargetSize; + Vector3 mItemsParentOrigin; + Vector3 mItemsAnchorPoint; + Vector2 mTotalPanDisplacement; + ItemLayout* mActiveLayout; - bool mAnchoringEnabled; float mAnchoringDuration; - - float mRefreshIntervalLayoutPositions; ///< Refresh item view when the layout position changes by this interval in both positive and negative directions. - PropertyNotification mRefreshNotification; // stores the property notification used for item view refresh - bool mRefreshOrderHint; ///< True if scrolling towards the last item - - // Input handling - + float mRefreshIntervalLayoutPositions; ///< Refresh item view when the layout position changes by this interval in both positive and negative directions. float mMinimumSwipeSpeed; float mMinimumSwipeDistance; - float mWheelScrollDistanceStep; ///< The step of scroll distance in actor coordinates for each wheel event received. - + float mWheelScrollDistanceStep; ///< The step of scroll distance in actor coordinates for each wheel event received. float mScrollDistance; float mScrollSpeed; - Vector2 mTotalPanDisplacement; - float mScrollOvershoot; - bool mIsFlicking; - - Timer mWheelEventFinishedTimer; ///< The timer to determine whether there is no wheel event received for a certain period of time. - - Dali::Gesture::State mGestureState; - Actor mOvershootOverlay; ///< The overlay actor for overshoot effect - - bool mAddingItems; - - bool mRefreshEnabled; ///< Whether to refresh the cache automatically - - Vector3 mItemsParentOrigin; - Vector3 mItemsAnchorPoint; - - LayoutActivatedSignalType mLayoutActivatedSignal; + Dali::Gesture::State mGestureState : 3; + bool mAnimatingOvershootOn : 1; ///< Whether we are currently animating overshoot to 1.0f/-1.0f (on) or to 0.0f (off) + bool mAnimateOvershootOff : 1; ///< Whether we are currently animating overshoot to 1.0f/-1.0f (on) or to 0.0f (off) + bool mAnchoringEnabled : 1; + bool mRefreshOrderHint : 1; ///< True if scrolling towards the last item + bool mIsFlicking : 1; + bool mAddingItems : 1; + bool mRefreshEnabled : 1; ///< Whether to refresh the cache automatically + bool mInAnimation : 1; ///< Keeps track of whether an animation is controlling the overshoot property. }; } // namespace Internal