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 "Legacy Size negotiation mapper" into devel/master
[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
old mode 100644
(file)
new mode 100755
(executable)
index
d006775
..
4962032
--- a/
dali-toolkit/devel-api/layouting/layout-group.h
+++ b/
dali-toolkit/devel-api/layouting/layout-group.h
@@
-17,8
+17,8
@@
*/
#include <memory>
*/
#include <memory>
-#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/actors/actor-enumerations.h>
#include <dali/public-api/actors/actor-enumerations.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>
#include <dali-toolkit/devel-api/layouting/layout-item.h>
#include <dali-toolkit/devel-api/layouting/measure-spec.h>
@@
-48,23
+48,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_
IMPOR
T_API LayoutGroup : public LayoutItem
+class DALI_
TOOLKI
T_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
+79,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;