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
Fix compile errors after removing boost function include from dali-core
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
scrollable
/
item-view
/
item-layout.h
diff --git
a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
index
92659ed
..
ee9ca7d
100644
(file)
--- a/
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
+++ b/
dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
@@
-19,6
+19,7
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
+#include <boost/function.hpp>
#include <dali/public-api/animation/alpha-functions.h>
#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/animation/alpha-functions.h>
#include <dali/public-api/common/vector-wrapper.h>
@@
-412,7
+413,8
@@
protected:
protected:
ControlOrientation::Type mOrientation; ///< the orientation of the layout.
protected:
ControlOrientation::Type mOrientation; ///< the orientation of the layout.
- AlphaFunction mAlphaFunction; ///<Alpha function to be applied when removing/adding constraints
+ AlphaFunction mAlphaFunction; ///< Alpha function to be applied when removing/adding constraints
+ Handle mWeightObject; ///< Weight object gets created to apply the constraints over a certain time
};
} // namespace Toolkit
};
} // namespace Toolkit