X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fitem-view%2Fdepth-layout.h;h=0f9f2637e2b0488499c54b666852099795be7b17;hb=19b6edb066bc90ab6fd4ce93b9dc49b5224d7815;hp=c1f18f9bdcd76da69e29a412129ebc23ad3da719;hpb=2b2e29847f9b8a544f0629db0285347ad07b6994;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.h b/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.h index c1f18f9..0f9f263 100644 --- a/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.h +++ b/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_DEPTH_LAYOUT_H__ -#define __DALI_TOOLKIT_DEPTH_LAYOUT_H__ +#ifndef DALI_TOOLKIT_DEPTH_LAYOUT_H +#define DALI_TOOLKIT_DEPTH_LAYOUT_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -23,13 +23,10 @@ namespace Dali { - namespace Toolkit { - namespace Internal { - class DepthLayout; typedef IntrusivePtr DepthLayoutPtr; @@ -40,7 +37,6 @@ typedef IntrusivePtr DepthLayoutPtr; class DepthLayout : public ItemLayout { public: - /** * Create a new spiral layout */ @@ -52,6 +48,12 @@ public: virtual ~DepthLayout(); /** + * Apply depth layout Properties. + * @param[in] properties The properties of the layout. + */ + void SetDepthLayoutProperties(const Property::Map& properties); + + /** * Set the number of columns in the layout. * @param[in] columns The number of columns. */ @@ -136,89 +138,88 @@ public: /** * @copydoc ItemLayout::GetScrollSpeedFactor() */ - virtual float GetScrollSpeedFactor() const; + float GetScrollSpeedFactor() const override; /** * @copydoc ItemLayout::GetMaximumSwipeSpeed() */ - virtual float GetMaximumSwipeSpeed() const; + float GetMaximumSwipeSpeed() const override; /** * @copydoc ItemLayout::GetItemFlickAnimationDuration() */ - virtual float GetItemFlickAnimationDuration() const; + float GetItemFlickAnimationDuration() const override; /** * @copydoc ItemLayout::GetClosestOnScreenLayoutPosition() */ - virtual float GetClosestOnScreenLayoutPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize); + float GetClosestOnScreenLayoutPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) override; /** * @copydoc ItemLayout::GetNextFocusItemID() */ - virtual int GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled); + int GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled) override; private: - /** * @copydoc ItemLayout::GetMinimumLayoutPosition() */ - virtual float GetMinimumLayoutPosition(unsigned int numberOfItems, Vector3 layoutSize) const; + float GetMinimumLayoutPosition(unsigned int numberOfItems, Vector3 layoutSize) const override; /** * @copydoc ItemLayout::GetClosestAnchorPosition() */ - virtual float GetClosestAnchorPosition(float layoutPosition) const; + float GetClosestAnchorPosition(float layoutPosition) const override; /** * @copydoc ItemLayout::GetItemScrollToPosition() */ - virtual float GetItemScrollToPosition(unsigned int itemId) const; + float GetItemScrollToPosition(unsigned int itemId) const override; /** * @copydoc ItemLayout::GetItemsWithinArea() */ - virtual ItemRange GetItemsWithinArea(float firstItemPosition, Vector3 layoutSize) const; + ItemRange GetItemsWithinArea(float firstItemPosition, Vector3 layoutSize) const override; /** * @copydoc ItemLayout::GetReserveItemCount() */ - virtual unsigned int GetReserveItemCount(Vector3 layoutSize) const; + unsigned int GetReserveItemCount(Vector3 layoutSize) const override; /** * @copydoc ItemLayout::GetDefaultItemSize() */ - virtual void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const; - - /** - * @copydoc ItemLayout::GetResizeAnimation() - */ - virtual void GetResizeAnimation(Animation& animation, Actor actor, Vector3 size, float durationSeconds) const; + void GetDefaultItemSize(unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize) const override; /** * @copydoc ItemLayout::GetScrollDirection() */ - virtual Degree GetScrollDirection() const; + Degree GetScrollDirection() const override; /** * @copydoc ItemLayout::ApplyConstraints() */ - virtual void ApplyConstraints( Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor ); + void ApplyConstraints(Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor) override; /** * @copydoc ItemLayout::GetItemPosition() */ - virtual Vector3 GetItemPosition( int itemID, float currentLayoutPosition, const Vector3& layoutSize ) const; + Vector3 GetItemPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) const override; protected: - /** * Protected constructor; see also DepthLayout::New() */ DepthLayout(); private: + // Undefined + DepthLayout(const DepthLayout& depthLayout); + + // Undefined + DepthLayout& operator=(const DepthLayout& depthLayout); +private: struct Impl; Impl* mImpl; }; @@ -229,4 +230,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_DEPTH_LAYOUT_H__ +#endif // DALI_TOOLKIT_DEPTH_LAYOUT_H