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=9cb2df6fc421691b1b316a5eb4dc5c4ea7f5e202;hp=3d31e1c7b55b04f1487d8efe7b0fb5fe1fca77d9;hb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;hpb=314952dcbfa53f31a250aa175bf19f0a4ade74f6 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 old mode 100644 new mode 100755 index 3d31e1c..9cb2df6 --- 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,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H__ -#define __DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H__ +#ifndef DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H +#define DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -22,12 +22,14 @@ #include #include #include -#include +#include +#include // INTERNAL INCLUDES #include #include #include +#include #include #include @@ -216,11 +218,6 @@ public: void ReplaceItems(const ItemContainer& replacementItems, float durationSeconds); /** - * @copydoc Toolkit::Scrollable::GetDomainSize - */ - Vector2 GetDomainSize() const; - - /** * @copydoc Toolkit::Scrollable::GetCurrentScrollPosition */ Vector2 GetCurrentScrollPosition() const; @@ -241,6 +238,11 @@ public: void ScrollTo(const Vector2& position, float duration); /** + * @copydoc Toolkit::Internal::Scrollable::SetOvershootSize + */ + void SetOvershootSize( const Vector2& size ); + + /** * @copydoc Toolkit::Internal::Scrollable::SetOvershootEffectColor */ void SetOvershootEffectColor( const Vector4& color ); @@ -340,9 +342,27 @@ public: */ void DoStopScrolling(); + /** + * Helper for DoAction( ACTION_ENABLE/DISABLE_REFRESH_NOTIFICATIONS ). + * @param[in] enabled Whether to disable refresh notifications or not. + */ + void SetRefreshNotificationEnabled( bool enabled ); + private: /** + * Get all the layouts used in the ItemView. + * @return The layout array + */ + Property::Array GetLayoutArray(); + + /** + * Set all the layouts. that will be used in the ItemView. + * @param[in] layouts The layouts used in the itemView. + */ + void SetLayoutArray( const Property::Array& layouts ); + + /** * Remove an Actor if found in the ItemPool. * @param[in] itemId The item to remove. * @return True if the remaining actors were reordered. @@ -392,13 +412,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. @@ -484,14 +497,6 @@ 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. @@ -502,6 +507,14 @@ private: 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. * * @param[in] gesture The gesture event. @@ -594,11 +607,9 @@ private: private: - typedef std::map ItemPool; - typedef ItemPool::iterator ItemPoolIter; - typedef ItemPool::const_iterator ConstItemPoolIter; + Property::Array mlayoutArray; - ItemPool mItemPool; + ItemContainer mItemPool; ItemFactory& mItemFactory; std::vector< ItemLayoutPtr > mLayouts; ///< Container of Dali::Toolkit::ItemLayout objects Actor mOvershootOverlay; ///< The overlay actor for overshoot effect @@ -623,7 +634,7 @@ private: float mScrollSpeed; float mScrollOvershoot; - Dali::Gesture::State mGestureState : 3; + Dali::Gesture::State mGestureState : 4; 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; @@ -631,6 +642,7 @@ private: bool mIsFlicking : 1; bool mAddingItems : 1; bool mRefreshEnabled : 1; ///< Whether to refresh the cache automatically + bool mRefreshNotificationEnabled : 1; ///< Whether to disable refresh notifications or not. bool mInAnimation : 1; ///< Keeps track of whether an animation is controlling the overshoot property. }; @@ -660,4 +672,4 @@ inline const Toolkit::Internal::ItemView& GetImpl(const Toolkit::ItemView& itemV } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H__ +#endif // DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H