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
Controls are LayoutGroups instead of LayoutItems
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
layouting
/
layout-group.h
diff --git
a/dali-toolkit/devel-api/layouting/layout-group.h
b/dali-toolkit/devel-api/layouting/layout-group.h
index
61d81e2
..
9d0e684
100644
(file)
--- a/
dali-toolkit/devel-api/layouting/layout-group.h
+++ b/
dali-toolkit/devel-api/layouting/layout-group.h
@@
-19,7
+19,8
@@
#include <memory>
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/actors/actor-enumerations.h>
#include <memory>
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/actors/actor-enumerations.h>
-#include <dali-toolkit/devel-api/layouting/layout-base.h>
+#include <dali-toolkit/devel-api/toolkit-property-index-ranges.h>
+#include <dali-toolkit/devel-api/layouting/layout-item.h>
#include <dali-toolkit/devel-api/layouting/measure-spec.h>
namespace Dali
#include <dali-toolkit/devel-api/layouting/measure-spec.h>
namespace Dali
@@
-34,7
+35,7
@@
class LayoutGroup;
/**
/**
- * A layout that has layout children. Implements Layout
Base
.
+ * A layout that has layout children. Implements Layout
Item
.
* It can both layout it's children, and be laid out by a parent container.
*
* A layout group automatically handles adding a Control container's children to itself,
* It can both layout it's children, and be laid out by a parent container.
*
* A layout group automatically handles adding a Control container's children to itself,
@@
-48,23
+49,16
@@
class LayoutGroup;
* To write a new layout, inherit from both LayoutGroup handle and Internal::LayoutGroup body.
*
*/
* To write a new layout, inherit from both LayoutGroup handle and Internal::LayoutGroup body.
*
*/
-class DALI_
IMPORT_API LayoutGroup : public LayoutBase
+class DALI_
TOOLKIT_API LayoutGroup : public LayoutItem
{
public:
using LayoutId = unsigned int;
static const unsigned int UNKNOWN_ID = 0;
{
public:
using LayoutId = unsigned int;
static const unsigned int UNKNOWN_ID = 0;
- enum PropertyRange
- {
- CHILD_PROPERTY_START_INDEX = CHILD_PROPERTY_REGISTRATION_START_INDEX+100,
- CHILD_PROPERTY_END_INDEX = CHILD_PROPERTY_START_INDEX+1000
- };
-
struct ChildProperty
{
enum
{
struct ChildProperty
{
enum
{
- MARGIN_SPECIFICATION = CHILD_PROPERTY_START_INDEX,
};
};
};
};
@@
-86,6
+80,13
@@
public:
~LayoutGroup() = default;
/**
~LayoutGroup() = default;
/**
+ * @brief Create an initialized LayoutGroup
+ *
+ * @param[in] handle A handle to the object that this layout for, e.g. a Control or a Visual::Base
+ */
+ static LayoutGroup New( Handle& handle );
+
+ /**
* @brief Copy constructor
*/
LayoutGroup(const LayoutGroup& copy) = default;
* @brief Copy constructor
*/
LayoutGroup(const LayoutGroup& copy) = default;
@@
-112,7
+113,7
@@
public:
* @param[in] childLayout The layout to add.
* @return an Id of the child.
*/
* @param[in] childLayout The layout to add.
* @return an Id of the child.
*/
- LayoutId Add( Layout
Base
& childLayout );
+ LayoutId Add( Layout
Item
& childLayout );
/**
* @brief Add a child layout to the layout group
/**
* @brief Add a child layout to the layout group
@@
-126,14
+127,14
@@
public:
*
* @param[in] childLayout The layout to remove.
*/
*
* @param[in] childLayout The layout to remove.
*/
- void Remove( Layout
Base
& childLayout );
+ void Remove( Layout
Item
& childLayout );
/**
* @brief Get the child at the given index.
*
* @param[in] index The index of the child.
*/
/**
* @brief Get the child at the given index.
*
* @param[in] index The index of the child.
*/
- Layout
Base
GetChildAt( unsigned int index ) const;
+ Layout
Item
GetChildAt( unsigned int index ) const;
/**
* @brief Get the count of the children of the layout
/**
* @brief Get the count of the children of the layout
@@
-148,14
+149,13
@@
public:
* @param[in] childId The id of the child to get
* @return A handle to the child layout, or empty if not found
*/
* @param[in] childId The id of the child to get
* @return A handle to the child layout, or empty if not found
*/
- Layout
Base
GetChild( LayoutId childId ) const ;
+ Layout
Item
GetChild( LayoutId childId ) const ;
/**
* Delete template method to remove implicit casting to integer types.
*/
template <typename T>
/**
* Delete template method to remove implicit casting to integer types.
*/
template <typename T>
- LayoutBase GetChild( T childId ) = delete;
-
+ LayoutItem GetChild( T childId ) = delete;
public:
/// @cond internal
public:
/// @cond internal
@@
-164,7
+164,7
@@
public:
*
* @param[in] actor A pointer to a newly allocated Dali resource
*/
*
* @param[in] actor A pointer to a newly allocated Dali resource
*/
- explicit
DALI_INTERNAL
LayoutGroup( Internal::LayoutGroup* layoutGroup );
+ explicit LayoutGroup( Internal::LayoutGroup* layoutGroup );
/// @endcond
};
/// @endcond
};