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=16f0b0a158236ff2542106f9c04b6d524698b297;hp=7c41d1f49a0501841f8e0733b4461380111f4cd2;hb=a78bb823aebc305823855ac35b3413aaff7bc684;hpb=834ddf7832598a57fc18c282371554a1ed8f0a78 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 7c41d1f..16f0b0a 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 @@ -22,12 +22,12 @@ #include #include #include +#include // INTERNAL INCLUDES #include #include #include -#include #include #include @@ -61,11 +61,6 @@ public: static Dali::Toolkit::ItemView New(ItemFactory& factory); /** - * @copydoc Toolkit::ItemView::GetScrollConnector - */ - Dali::Toolkit::ScrollConnector GetScrollConnector() const; - - /** * @copydoc Toolkit::ItemView::GetLayoutCount */ unsigned int GetLayoutCount() const; @@ -126,14 +121,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 @@ -218,12 +213,12 @@ public: /** * @copydoc Toolkit::Scrollable::GetDomainSize */ - Vector3 GetDomainSize() const; + Vector2 GetDomainSize() const; /** * @copydoc Toolkit::Scrollable::GetCurrentScrollPosition */ - Vector3 GetCurrentScrollPosition() const; + Vector2 GetCurrentScrollPosition() const; /** * @copydoc Toolkit::Scrollable::AddOverlay() @@ -236,9 +231,9 @@ public: void RemoveOverlay(Actor actor); /** - * @copydoc Toolkit::Scrollable::ScrollTo(const Vector3& position, float duration) + * @copydoc Toolkit::Scrollable::ScrollTo(const Vector2& position, float duration) */ - void ScrollTo(const Vector3& position, float duration); + void ScrollTo(const Vector2& position, float duration); /** * @copydoc Toolkit::Internal::Scrollable::SetOvershootEffectColor @@ -307,23 +302,23 @@ private: /** * Add a range of Actors, if they are not already in the ItemPool. * @param[in] range The range of Item IDs to associate with the new actors. - * @param[in] durationSeconds The time taken to fully constrain the newly added actor. + * @param[in] layoutSize The layout-size. */ - void AddActorsWithinRange( ItemRange range, float durationSeconds ); + void AddActorsWithinRange( ItemRange range, const Vector3& layoutSize ); /** * Add a new Actor, if not already in the ItemPool. * @param[in] item The ID for the new item. - * @param[in] durationSeconds The time taken to fully constrain the new actor. + * @param[in] layoutSize The layout-size. */ - void AddNewActor( ItemId item, float durationSeconds ); + void AddNewActor( ItemId item, const Vector3& layoutSize ); /** * Apply the constraints etc. that are required for ItemView children. * @param[in] item The item to setup. - * @param[in] durationSeconds The time taken to fully constrain the actor. + * @param[in] layoutSize The layout-size. */ - void SetupActor( Item item, float durationSeconds ); + void SetupActor( Item item, const Vector3& layoutSize ); /** * Remove the Actor from the ItemPool and notify the ItemFactory the actor has been released by ItemView. @@ -348,11 +343,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 @@ -369,7 +364,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() @@ -401,7 +396,7 @@ private: * Helper to re-apply all the constraints after items have been inserted, removed etc. * @param[in] durationSeconds The time taken to fully constrain the actors. */ - void ReapplyAllConstraints( float durationSeconds ); + void ReapplyAllConstraints(); /** * Helper to relayout after item(s) are removed. @@ -482,10 +477,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. @@ -494,9 +489,9 @@ private: void RemoveAnimation(Animation& animation); /** - * @copydoc Toolkit::Internal::Scrollable::SetOvershootEnabled + * @copydoc Toolkit::Internal::Scrollable::EnableScrollOvershoot */ - virtual void SetOvershootEnabled( bool enable ); + virtual void EnableScrollOvershoot( bool enable ); /** * Helper to calculate the scroll overshoot according to the pan gesture displacement. @@ -541,7 +536,7 @@ private: void OnRefreshNotification(PropertyNotification& source); /** - * This is called when scroll position has been changed by ScrollConnector::SetScrollPosition. + * This is called when the change of scroll position is notified by ScrollBar. * @param[in] position The new scroll position */ void OnScrollPositionChanged( float position ); @@ -556,7 +551,7 @@ private: ItemPool mItemPool; - ItemLayoutContainer mLayouts; + std::vector< ItemLayoutPtr > mLayouts; ///< Container of Dali::Toolkit::ItemLayout objects ItemLayout* mActiveLayout; Vector3 mActiveLayoutTargetSize; @@ -577,7 +572,7 @@ private: 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; @@ -586,21 +581,14 @@ private: float mScrollOvershoot; bool mIsFlicking; - Timer mMouseWheelEventFinishedTimer; ///< The timer to determine whether there is no mouse wheel event received for a certain period of time. + 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 - Dali::Toolkit::ScrollConnector mScrollConnector; ///< Connects ItemView with scrollable components e.g. scroll bars - Handle mScrollPositionObject; ///< From mScrollConnector - bool mAddingItems; - Property::Index mPropertyPosition; ///< The physical position of the first item within the layout - Property::Index mPropertyMinimumLayoutPosition; ///< The minimum valid layout position in the layout. - Property::Index mPropertyScrollSpeed; ///< The current scroll speed of item view - bool mRefreshEnabled; ///< Whether to refresh the cache automatically Vector3 mItemsParentOrigin;