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 RTL direction layout for LinearLayout.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
layouting
/
layout-item-impl.h
diff --git
a/dali-toolkit/devel-api/layouting/layout-item-impl.h
b/dali-toolkit/devel-api/layouting/layout-item-impl.h
index
fb12913
..
5f4c4a5
100644
(file)
--- a/
dali-toolkit/devel-api/layouting/layout-item-impl.h
+++ b/
dali-toolkit/devel-api/layouting/layout-item-impl.h
@@
-44,8
+44,8
@@
using LayoutItemPtr = IntrusivePtr<LayoutItem>;
/**
* Base class for layouts.
*/
/**
* Base class for layouts.
*/
-class DALI_
IMPOR
T_API LayoutItem : public BaseObject,
- public LayoutParent
+class DALI_
TOOLKI
T_API LayoutItem : public BaseObject,
+
public LayoutParent
{
public:
/**
{
public:
/**
@@
-168,6
+168,11
@@
public:
static LayoutLength GetDefaultSize( LayoutLength size, MeasureSpec measureSpec );
/**
static LayoutLength GetDefaultSize( LayoutLength size, MeasureSpec measureSpec );
/**
+ * @copydoc LayoutParent::SetParent
+ */
+ virtual void SetParent( LayoutParent* parent ) override;
+
+ /**
* @copydoc LayoutParent::GetParent
*/
virtual LayoutParent* GetParent() override;
* @copydoc LayoutParent::GetParent
*/
virtual LayoutParent* GetParent() override;
@@
-187,6
+192,11
@@
public:
bool IsLayoutRequested() const;
/**
bool IsLayoutRequested() const;
/**
+ * @brief Set layout requested flag (mark the layout dirty).
+ */
+ void SetLayoutRequested();
+
+ /**
* @brief Get the measured width (without any measurement flags).
*
* This method should be used only during measurement and layout calculations.
* @brief Get the measured width (without any measurement flags).
*
* This method should be used only during measurement and layout calculations.
@@
-289,11
+299,17
@@
public:
LayoutLength GetMinimumHeight() const;
/**
LayoutLength GetMinimumHeight() const;
/**
- * Get the padding information
+ * Get the padding information
.
* @return The padding information
*/
Extents GetPadding() const;
* @return The padding information
*/
Extents GetPadding() const;
+ /**
+ * Get the margin information.
+ * @return The margin information
+ */
+ Extents GetMargin() const;
+
protected:
/**
* @brief Allow directly deriving classes to remove layout children when unparented
protected:
/**
* @brief Allow directly deriving classes to remove layout children when unparented
@@
-307,7
+323,6
@@
protected:
*/
virtual void OnRegisterChildProperties( const std::string& containerType );
*/
virtual void OnRegisterChildProperties( const std::string& containerType );
-
/**
* @brief Measure the layout and its content to determine the measured width and the
* measured height.
/**
* @brief Measure the layout and its content to determine the measured width and the
* measured height.