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=0af85fc388c26f8582384dbabba6df2f223c8ad2;hp=5ae01124e66680f3faf19b6655734049742a61c9;hb=ed11499452da1ccd5fdfa36324881dc66a5281bc;hpb=287b68cccb9fdccf44de630575421f5b2e12ae35 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 5ae0112..0af85fc --- 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) 2020 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 @@ -236,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 ); @@ -335,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. @@ -384,38 +409,45 @@ private: // From CustomActorImpl * From CustomActorImpl; called after a child has been added to the owning actor. * @param[in] child The child which has been added. */ - virtual void OnChildAdd(Actor& child); + void OnChildAdd(Actor& child) override; /** - * From CustomActorImpl; called after a wheel-event is received by the owning actor. + * Called after a wheel-event is received by the owning actor. + * @param[in] actor Actor associated with the wheel event. * @param[in] event The wheel event. * @return True if the event should be consumed. */ - virtual bool OnWheelEvent(const WheelEvent& event); + bool OnWheelEvent(Actor actor, const WheelEvent& event); private: // From Control /** * @copydoc Toolkit::Control::OnInitialize() */ - virtual void OnInitialize(); + void OnInitialize() override; /** * @copydoc Toolkit::Control::OnAccessibilityPan() */ - virtual bool OnAccessibilityPan(PanGesture gesture); + bool OnAccessibilityPan(PanGesture gesture) override; /** * @copydoc Toolkit::Control::GetNextKeyboardFocusableActor() */ - virtual Actor GetNextKeyboardFocusableActor(Actor actor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled); + Actor GetNextKeyboardFocusableActor(Actor actor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled) override; /** * @copydoc Toolkit::Control::OnKeyboardFocusChangeCommitted() */ - virtual void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor); + void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) override; protected: + struct AccessibleImpl : public Scrollable::AccessibleImpl + { + using Scrollable::AccessibleImpl::AccessibleImpl; + + void EnsureChildVisible(Actor child) override; + }; /** * Construct a new ItemView. @@ -487,7 +519,7 @@ private: * @param[in] touch The touch information. * @return True if the event should be consumed. */ - bool OnTouch( Actor actor, const TouchData& touch ); + bool OnTouch( Actor actor, const TouchEvent& touch ); /** * Called upon pan gesture event. @@ -536,7 +568,7 @@ private: /** * @copydoc Toolkit::Internal::Scrollable::EnableScrollOvershoot */ - virtual void EnableScrollOvershoot( bool enable ); + void EnableScrollOvershoot( bool enable ) override; /** * Helper to calculate the scroll overshoot according to the pan gesture displacement. @@ -582,11 +614,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 @@ -611,7 +641,7 @@ private: float mScrollSpeed; float mScrollOvershoot; - Dali::Gesture::State mGestureState : 3; + GestureState mGestureState : 8; 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; @@ -619,6 +649,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. }; @@ -648,4 +679,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