X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Flayouting%2Flayout-item-impl.h;h=5f4c4a551c6421cf09d4f685da2facfdef41dc6e;hb=34d91b1758ac881dfde1ece06a7b152bd1353ae5;hp=fb129132345d905eeb2dbdb8b62c66b4786ab327;hpb=20b42a9bcaba6b874f2271f03a56da6f884c4053;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 --- 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; /** * Base class for layouts. */ -class DALI_IMPORT_API LayoutItem : public BaseObject, - public LayoutParent +class DALI_TOOLKIT_API LayoutItem : public BaseObject, + public LayoutParent { public: /** @@ -168,6 +168,11 @@ public: static LayoutLength GetDefaultSize( LayoutLength size, MeasureSpec measureSpec ); /** + * @copydoc LayoutParent::SetParent + */ + virtual void SetParent( LayoutParent* parent ) override; + + /** * @copydoc LayoutParent::GetParent */ virtual LayoutParent* GetParent() override; @@ -187,6 +192,11 @@ public: 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. @@ -289,11 +299,17 @@ public: LayoutLength GetMinimumHeight() const; /** - * Get the padding information + * Get the padding information. * @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 @@ -307,7 +323,6 @@ protected: */ virtual void OnRegisterChildProperties( const std::string& containerType ); - /** * @brief Measure the layout and its content to determine the measured width and the * measured height.