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 "Add child flex node with its margin" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
layouting
/
flex-node.h
diff --git
a/dali-toolkit/devel-api/layouting/flex-node.h
b/dali-toolkit/devel-api/layouting/flex-node.h
index
034e555
..
1b76f76
100644
(file)
--- a/
dali-toolkit/devel-api/layouting/flex-node.h
+++ b/
dali-toolkit/devel-api/layouting/flex-node.h
@@
-130,10
+130,11
@@
public:
/**
* @brief Insert child into the FlexLayout at the given index.
* @param[in] child Actor to insert.
/**
* @brief Insert child into the FlexLayout at the given index.
* @param[in] child Actor to insert.
+ * @param[in] margin of child Actor.
* @param[in] measureFunction for the child.
* @param[in] index to insert at.
*/
* @param[in] measureFunction for the child.
* @param[in] index to insert at.
*/
- void AddChild( Actor child, MeasureCallback measureFunction, int index );
+ void AddChild( Actor child,
Extents margin,
MeasureCallback measureFunction, int index );
/**
* @brief Remove child from the FlexLayout at the given index.
/**
* @brief Remove child from the FlexLayout at the given index.