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=9fc58aa3fb31ea7f1bc297252885592c6057f2ab;hp=5f42a61f64827d522e24baad53902d4d20a73b0e;hb=445245be5ed13b969aaa0bd87647f3386f24d3eb;hpb=75034433e28c31e99ce28a2013c3967a7e165bf1 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 5f42a61..9fc58aa 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 @@ -1,33 +1,35 @@ #ifndef __DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H__ #define __DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H__ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // EXTERNAL INCLUDES -#include +#include +#include +#include +#include // INTERNAL INCLUDES #include #include #include -#include #include #include -#include namespace Dali { @@ -51,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. @@ -59,11 +66,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; @@ -99,16 +101,6 @@ public: void ActivateLayout(unsigned int layoutIndex, const Vector3& targetSize, float durationSeconds); /** - * @copydoc Toolkit::ItemView::SetDefaultAlphaFunction - */ - void SetDefaultAlphaFunction(AlphaFunction func); - - /** - * @copydoc Toolkit::ItemView::GetDefaultAlphaFunction - */ - AlphaFunction GetDefaultAlphaFunction() const; - - /** * @copydoc Toolkit::ItemView::DeactivateCurrentLayout */ void DeactivateCurrentLayout(); @@ -134,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 @@ -179,6 +171,11 @@ public: float GetRefreshInterval() const; /** + * @copydoc Toolkit::ItemView::Refresh + */ + void Refresh(); + + /** * @copydoc Toolkit::ItemView::GetItem */ Actor GetItem(unsigned int itemId) const; @@ -221,12 +218,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() @@ -239,9 +236,14 @@ 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 + */ + void SetOvershootEffectColor( const Vector4& color ); /** * @brief Set whether to enable automatic refresh or not. When refresh is disabled, @@ -262,12 +264,56 @@ public: */ void DoRefresh(float currentLayoutPosition, bool cacheExtra); + /** + * @copydoc Toolkit::ItemView::SetItemsParentOrigin + */ + void SetItemsParentOrigin( const Vector3& parentOrigin ); + + /** + * @copydoc Toolkit::ItemView::GetItemsParentOrigin + */ + Vector3 GetItemsParentOrigin() const; + + /** + * @copydoc Toolkit::ItemView::SetItemsAnchorPoint + */ + void SetItemsAnchorPoint( const Vector3& anchorPoint ); + + /** + * @copydoc Toolkit::ItemView::GetItemsAnchorPoint + */ + Vector3 GetItemsAnchorPoint() const; + + /** + * @copydoc Toolkit::ItemView::GetItemsRange + */ + 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: /** * Remove an Actor if found in the ItemPool. * @param[in] itemId The item to remove. - * @return True if an actor was removed. + * @return True if the remaining actors were reordered. */ bool RemoveActor( unsigned int itemId ); @@ -280,23 +326,30 @@ 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. + * @param[in] item The ID for the item to be released. + * @param[in] actor The actor to be removed from ItemView. + */ + void ReleaseActor( ItemId item, Actor actor ); private: // From CustomActorImpl @@ -314,13 +367,13 @@ 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 ControlImpl +private: // From Control /** * @copydoc Toolkit::Control::OnInitialize() @@ -335,7 +388,7 @@ private: // From ControlImpl /** * @copydoc Toolkit::Control::GetNextKeyboardFocusableActor() */ - virtual Actor GetNextKeyboardFocusableActor(Actor actor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled); + virtual Actor GetNextKeyboardFocusableActor(Actor actor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled); /** * @copydoc Toolkit::Control::OnKeyboardFocusChangeCommitted() @@ -364,19 +417,15 @@ private: ItemView& operator=(const ItemView& rhs); /** - * Helper to apply constraints to an actor. - * @param[in] actor The actor to constrain. - * @param[in] layout The active layout. - * @param[in] itemId The ID of the item represented by the actor. + * 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 ApplyConstraints(Actor& actor, ItemLayout& layout, unsigned int itemId, float durationSeconds); + void ReapplyAllConstraints(); /** - * 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. + * Helper to relayout after item(s) are removed. */ - void ReapplyAllConstraints( float durationSeconds ); + void OnItemsRemoved(); /** * Helper to remove items outside a given range. @@ -424,7 +473,7 @@ private: * * @param[in] gesture The gesture event. */ - void OnPan(PanGesture pan); + void OnPan( const PanGesture& pan ); /** * Helper to handle anchoring animations. @@ -439,6 +488,12 @@ private: void OnScrollFinished(Animation& animation); /** + * Callback from layout activation scroll animations + * @param[in] animation The scroll-animation which has finished. + */ + void OnLayoutActivationScrollFinished(Animation& animation); + + /** * Called by animation system when overshoot has finished animating to maximum (either -1.0f or 1.0f) * * @param[in] animation the animation that has finished @@ -446,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. @@ -458,9 +513,9 @@ private: void RemoveAnimation(Animation& animation); /** - * Helper to apply constraints to the overshoot overlay actor. + * @copydoc Toolkit::Internal::Scrollable::EnableScrollOvershoot */ - void ApplyOvershootOverlayConstraints(); + virtual void EnableScrollOvershoot( bool enable ); /** * Helper to calculate the scroll overshoot according to the pan gesture displacement. @@ -514,15 +569,12 @@ private: ItemPool mItemPool; - ItemLayoutContainer mLayouts; + std::vector< ItemLayoutPtr > mLayouts; ///< Container of Dali::Toolkit::ItemLayout objects ItemLayout* mActiveLayout; Vector3 mActiveLayoutTargetSize; - AlphaFunction mDefaultAlphaFunction; - Animation mResizeAnimation; Animation mScrollAnimation; - Animation mScrollSpeedAnimation; 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) @@ -538,7 +590,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; @@ -547,23 +599,20 @@ 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; - ImageActor mOvershootOverlay; ///< The overlay actor for overshoot effect - OvershootRippleEffect mOvershootEffect; ///< The vertex/fragment shader used to display the overshoot ripple effect - - Dali::Toolkit::ScrollConnector mScrollConnector; ///< Connects ItemView with scrollable components e.g. scroll bars - Constrainable mScrollPositionObject; ///< From mScrollConnector + Actor mOvershootOverlay; ///< The overlay actor for overshoot effect 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; + Vector3 mItemsAnchorPoint; + + LayoutActivatedSignalType mLayoutActivatedSignal; }; } // namespace Internal