X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fitem-view%2Fspiral-layout.h;h=7143c193f44f08c6a876dcf61ee03af556ab2d6b;hb=2bd13b0e87ffbe66fafc837ddffb6d2e491c1a63;hp=4d6543338e370194d5641b6b195837e857a032dd;hpb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h b/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h index 4d65433..7143c19 100755 --- a/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h +++ b/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h @@ -121,69 +121,69 @@ 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; 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; + 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: