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=2fe5e090f148ff8dcb43e7fd67a552308516b31e;hp=851b64029a40dcf64c94cc1a0f17aa49e88323f6;hb=49756b2890a35a8875fb5d619992d99991fe15e4;hpb=9781441fa162e32e5796658d4169387a3ffb5d88 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 851b640..2fe5e09 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 @@ -21,8 +21,8 @@ // EXTERNAL INCLUDES #include #include -#include #include +#include // INTERNAL INCLUDES #include @@ -53,6 +53,11 @@ class ItemView : public Scrollable { public: + // Signals + typedef Toolkit::ItemView::LayoutActivatedSignalType LayoutActivatedSignalType; + +public: + /** * Create a new ItemView. * @param[in] factory The factory which provides ItemView with items. @@ -121,14 +126,14 @@ public: float GetMinimumSwipeDistance() const; /** - * @copydoc Toolkit::ItemView::SetMouseWheelScrollDistanceStep + * @copydoc Toolkit::ItemView::SetWheelScrollDistanceStep */ - void SetMouseWheelScrollDistanceStep(float step); + void SetWheelScrollDistanceStep(float step); /** - * @copydoc Toolkit::ItemView::GetMouseWheelScrollDistanceStep + * @copydoc Toolkit::ItemView::GetWheelScrollDistanceStep */ - float GetMouseWheelScrollDistanceStep() const; + float GetWheelScrollDistanceStep() const; /** * @copydoc Toolkit::ItemView::SetAnchoring @@ -284,6 +289,25 @@ public: */ void GetItemsRange(ItemRange& range); + /** + * @copydoc Toolkit::ItemView::LayoutActivatedSignal() + */ + LayoutActivatedSignalType& LayoutActivatedSignal() + { + return mLayoutActivatedSignal; + } + + /** + * Connects a callback function with the object's signals. + * @param[in] object The object providing the signal. + * @param[in] tracker Used to disconnect the signal. + * @param[in] signalName The signal to connect to. + * @param[in] functor A newly allocated FunctorDelegate. + * @return True if the signal was connected. + * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor. + */ + static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ); + private: /** @@ -343,11 +367,11 @@ private: // From CustomActorImpl virtual bool OnTouchEvent(const TouchEvent& event); /** - * From CustomActorImpl; called after a mouse-wheel-event is received by the owning actor. - * @param[in] event The mouse wheel 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. */ - virtual bool OnMouseWheelEvent(const MouseWheelEvent& event); + virtual bool OnWheelEvent(const WheelEvent& event); private: // From Control @@ -364,7 +388,7 @@ private: // From Control /** * @copydoc Toolkit::Control::GetNextKeyboardFocusableActor() */ - virtual Actor GetNextKeyboardFocusableActor(Actor actor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled); + virtual Actor GetNextKeyboardFocusableActor(Actor actor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled); /** * @copydoc Toolkit::Control::OnKeyboardFocusChangeCommitted() @@ -477,10 +501,10 @@ private: void OnOvershootOnFinished(Animation& animation); /** - * This is called after a timeout when no new mouse wheel event is received for a certain period of time. + * This is called after a timeout when no new wheel event is received for a certain period of time. * @return will return false; one-shot timer. */ - bool OnMouseWheelEventFinished(); + bool OnWheelEventFinished(); /** * Stops and removes animation if exists. @@ -535,64 +559,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 mMouseWheelScrollDistanceStep; ///< The step of scroll distance in actor coordinates for each mouse 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 mMouseWheelEventFinishedTimer; ///< The timer to determine whether there is no mouse 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; + 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