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 "(ItemLayout) Remove redundant GetResizeAnimation" 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
326dcc7
..
00f550a
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h
+++ b/
dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h
@@
-164,11
+164,6
@@
private:
virtual void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const;
/**
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;
-
- /**
* @copydoc ItemLayout::GetScrollDirection()
*/
virtual Degree GetScrollDirection() const;
* @copydoc ItemLayout::GetScrollDirection()
*/
virtual Degree GetScrollDirection() const;