projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Const correctness improvements for Property::Value." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
item-view
/
spiral-layout.h
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
(executable)
--- 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()
*/
/**
* @copydoc ItemLayout::GetScrollSpeedFactor()
*/
-
virtual float GetScrollSpeedFactor() const
;
+
float GetScrollSpeedFactor() const override
;
/**
* @copydoc ItemLayout::GetMaximumSwipeSpeed()
*/
/**
* @copydoc ItemLayout::GetMaximumSwipeSpeed()
*/
-
virtual float GetMaximumSwipeSpeed() const
;
+
float GetMaximumSwipeSpeed() const override
;
/**
* @copydoc ItemLayout::GetItemFlickAnimationDuration()
*/
/**
* @copydoc ItemLayout::GetItemFlickAnimationDuration()
*/
-
virtual float GetItemFlickAnimationDuration() const
;
+
float GetItemFlickAnimationDuration() const override
;
/**
* @copydoc ItemLayout::GetClosestOnScreenLayoutPosition()
*/
/**
* @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()
*/
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()
*/
/**
* @copydoc ItemLayout::GetClosestAnchorPosition()
*/
-
virtual float GetClosestAnchorPosition(float layoutPosition) const
;
+
float GetClosestAnchorPosition(float layoutPosition) const override
;
/**
* @copydoc ItemLayout::GetItemScrollToPosition()
*/
/**
* @copydoc ItemLayout::GetItemScrollToPosition()
*/
-
virtual float GetItemScrollToPosition(unsigned int itemId) const
;
+
float GetItemScrollToPosition(unsigned int itemId) const override
;
/**
* @copydoc ItemLayout::GetItemsWithinArea()
*/
/**
* @copydoc ItemLayout::GetItemsWithinArea()
*/
-
virtual ItemRange GetItemsWithinArea(float firstItemPosition, Vector3 layoutSize) const
;
+
ItemRange GetItemsWithinArea(float firstItemPosition, Vector3 layoutSize) const override
;
/**
* @copydoc ItemLayout::GetReserveItemCount()
*/
/**
* @copydoc ItemLayout::GetReserveItemCount()
*/
-
virtual unsigned int GetReserveItemCount(Vector3 layoutSize) const
;
+
unsigned int GetReserveItemCount(Vector3 layoutSize) const override
;
/**
* @copydoc ItemLayout::GetDefaultItemSize()
*/
/**
* @copydoc ItemLayout::GetDefaultItemSize()
*/
- v
irtual void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const
;
+ v
oid GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const override
;
/**
* @copydoc ItemLayout::GetScrollDirection()
*/
/**
* @copydoc ItemLayout::GetScrollDirection()
*/
-
virtual Degree GetScrollDirection() const
;
+
Degree GetScrollDirection() const override
;
/**
* @copydoc ItemLayout::ApplyConstraints()
*/
/**
* @copydoc ItemLayout::ApplyConstraints()
*/
- v
irtual void ApplyConstraints( Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor )
;
+ v
oid ApplyConstraints( Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor ) override
;
/**
* @copydoc ItemLayout::GetItemPosition()
*/
/**
* @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: