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
Property refactor in dali-toolkit: Toolkit changes
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
scroll-view
/
scroll-base-impl.h
diff --git
a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
index
6c00f40
..
968e3ab
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
+++ b/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h
@@
-21,6
+21,8
@@
// EXTERNAL INCLUDES
// TODO - Replace list with dali-vector.h
#include <list>
// EXTERNAL INCLUDES
// TODO - Replace list with dali-vector.h
#include <list>
+#include <dali/public-api/animation/active-constraint.h>
+#include <dali/public-api/animation/constraint.h>
// INTERNAL INCLUDES
// INTERNAL INCLUDES
@@
-180,7
+182,7
@@
public:
protected:
protected:
- static const
std::string
SCROLL_DOMAIN_OFFSET_PROPERTY_NAME;
+ static const
char* const
SCROLL_DOMAIN_OFFSET_PROPERTY_NAME;
protected:
protected: