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 remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
cluster
/
cluster.h
diff --git
a/dali-toolkit/public-api/controls/cluster/cluster.h
b/dali-toolkit/public-api/controls/cluster/cluster.h
index
f8c845a
..
d417e0f
100644
(file)
--- a/
dali-toolkit/public-api/controls/cluster/cluster.h
+++ b/
dali-toolkit/public-api/controls/cluster/cluster.h
@@
-18,6
+18,10
@@
*
*/
*
*/
+// EXTERNAL INCLUDES
+#include <dali/public-api/animation/alpha-functions.h>
+#include <dali/public-api/animation/time-period.h>
+
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control.h>
@@
-50,7
+54,7
@@
public:
// Custom properties
// Custom properties
- static const std::string CLUSTER_ACTOR_DEPTH; ///< Property, name "cluster-actor-depth", type
FLOAT
+ static const std::string CLUSTER_ACTOR_DEPTH; ///< Property, name "cluster-actor-depth", type
float
public:
public: