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 "Remove batching." 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
old mode 100644
(file)
new mode 100755
(executable)
index
326dcc7
..
29c46d5
--- a/
dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h
+++ b/
dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h
@@
-22,6
+22,7
@@
#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
+
namespace Dali
{
namespace Dali
{
@@
-53,6
+54,12
@@
public:
virtual ~SpiralLayout();
/**
virtual ~SpiralLayout();
/**
+ * Apply spiral layout Properties.
+ * @param[in] properties The properties of the layout.
+ */
+ void SetSpiralLayoutProperties(const Property::Map& properties);
+
+ /**
* Set spacing angle between items.
* @param[in] itemSpacing The angle in radians.
*/
* Set spacing angle between items.
* @param[in] itemSpacing The angle in radians.
*/
@@
-164,11
+171,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;
@@
-192,6
+194,14
@@
protected:
private:
private:
+ // Undefined
+ SpiralLayout( const SpiralLayout& spiralLayout );
+
+ // Undefined
+ SpiralLayout& operator=( const SpiralLayout& spiralLayout );
+
+private:
+
struct Impl;
Impl* mImpl;
};
struct Impl;
Impl* mImpl;
};