From: David Steele Date: Wed, 20 Jun 2018 11:10:15 +0000 (+0000) Subject: Merge "Fix linear layout size issue" into devel/master X-Git-Tag: dali_1.3.29~5 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6034549c1b9a7d8f82a1ce7f826dd1fd495c7dbe;hp=9c04d2d04d1e05d93ef4150defb3ba0bbaaa0d60 Merge "Fix linear layout size issue" into devel/master --- diff --git a/dali-toolkit/devel-api/layouting/absolute-layout.h b/dali-toolkit/devel-api/layouting/absolute-layout.h index b74b19d..5face16 100644 --- a/dali-toolkit/devel-api/layouting/absolute-layout.h +++ b/dali-toolkit/devel-api/layouting/absolute-layout.h @@ -39,7 +39,7 @@ class AbsoluteLayout; * Positions are from the top left of the layout and can be set using the * Actor::Property::POSITION and alike. */ -class DALI_IMPORT_API AbsoluteLayout : public LayoutGroup +class DALI_TOOLKIT_API AbsoluteLayout : public LayoutGroup { public: diff --git a/dali-toolkit/devel-api/layouting/layout-controller.h b/dali-toolkit/devel-api/layouting/layout-controller.h index db5cc5b..fe955a4 100644 --- a/dali-toolkit/devel-api/layouting/layout-controller.h +++ b/dali-toolkit/devel-api/layouting/layout-controller.h @@ -36,7 +36,7 @@ class LayoutController; * @brief Controls the process of layouting the control tree. It provides methods to enable * controls to re-layout and internal systems to separately measure and layout controls. */ -class DALI_IMPORT_API LayoutController : public BaseHandle +class DALI_TOOLKIT_API LayoutController : public BaseHandle { public: /** diff --git a/dali-toolkit/devel-api/layouting/layout-group-impl.h b/dali-toolkit/devel-api/layouting/layout-group-impl.h index 025950c..f827c30 100644 --- a/dali-toolkit/devel-api/layouting/layout-group-impl.h +++ b/dali-toolkit/devel-api/layouting/layout-group-impl.h @@ -54,8 +54,8 @@ using LayoutGroupPtr = IntrusivePtr; * OnLayout should use it's own layout parameters and the measured children's size to determine the children's * position and size; it should then call Layout() on the child layout to layout the child and it's hierarchy. */ -class DALI_IMPORT_API LayoutGroup : public LayoutItem, - public ConnectionTracker +class DALI_TOOLKIT_API LayoutGroup : public LayoutItem, + public ConnectionTracker { public: /** diff --git a/dali-toolkit/devel-api/layouting/layout-group.h b/dali-toolkit/devel-api/layouting/layout-group.h index c61eea8..1d9ad5d 100644 --- a/dali-toolkit/devel-api/layouting/layout-group.h +++ b/dali-toolkit/devel-api/layouting/layout-group.h @@ -49,7 +49,7 @@ class LayoutGroup; * To write a new layout, inherit from both LayoutGroup handle and Internal::LayoutGroup body. * */ -class DALI_IMPORT_API LayoutGroup : public LayoutItem +class DALI_TOOLKIT_API LayoutGroup : public LayoutItem { public: using LayoutId = unsigned int; diff --git a/dali-toolkit/devel-api/layouting/layout-item-impl.h b/dali-toolkit/devel-api/layouting/layout-item-impl.h index fe43f07..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: /** diff --git a/dali-toolkit/devel-api/layouting/layout-item.h b/dali-toolkit/devel-api/layouting/layout-item.h index 3bb96bb..bfe776f 100644 --- a/dali-toolkit/devel-api/layouting/layout-item.h +++ b/dali-toolkit/devel-api/layouting/layout-item.h @@ -24,6 +24,7 @@ #include #include #include +#include namespace Dali { @@ -42,7 +43,7 @@ using LayoutId = unsigned int; * Base class for layouts. It is used to layout a control (or visual). * It can be laid out by a LayoutGroup. */ -class DALI_IMPORT_API LayoutItem : public BaseHandle +class DALI_TOOLKIT_API LayoutItem : public BaseHandle { public: diff --git a/dali-toolkit/devel-api/layouting/layout-parent-impl.h b/dali-toolkit/devel-api/layouting/layout-parent-impl.h index 4ce1ab0..d55fb42 100644 --- a/dali-toolkit/devel-api/layouting/layout-parent-impl.h +++ b/dali-toolkit/devel-api/layouting/layout-parent-impl.h @@ -17,6 +17,8 @@ * limitations under the License. */ +#include + namespace Dali { namespace Toolkit @@ -30,7 +32,7 @@ namespace Internal * Needed to prevent circular inheritance - most LayoutBases have a parent, * but parenting is provided by LayoutGroup, which is a sub-class of LayoutBase. */ -class DALI_IMPORT_API LayoutParent +class DALI_TOOLKIT_API LayoutParent { public: /** diff --git a/dali-toolkit/devel-api/layouting/linear-layout.h b/dali-toolkit/devel-api/layouting/linear-layout.h index 8c6e51b..f30911b 100644 --- a/dali-toolkit/devel-api/layouting/linear-layout.h +++ b/dali-toolkit/devel-api/layouting/linear-layout.h @@ -37,7 +37,7 @@ class LinearLayout; * This class implements a linear box layout, automatically handling * right to left or left to right direction change. */ -class DALI_IMPORT_API LinearLayout : public LayoutGroup +class DALI_TOOLKIT_API LinearLayout : public LayoutGroup { public: diff --git a/dali-toolkit/devel-api/layouting/measure-spec.h b/dali-toolkit/devel-api/layouting/measure-spec.h index 92a03f2..04c4d01 100644 --- a/dali-toolkit/devel-api/layouting/measure-spec.h +++ b/dali-toolkit/devel-api/layouting/measure-spec.h @@ -19,6 +19,7 @@ #include #include +#include #include @@ -32,7 +33,7 @@ namespace Toolkit * how to be measured. For instance, it may measure a child with an exact width and an unspecified * height in order to determine height for width. */ -class DALI_IMPORT_API MeasureSpec +class DALI_TOOLKIT_API MeasureSpec { public: using IntType = LayoutLength::IntType; diff --git a/dali-toolkit/devel-api/layouting/measured-size.h b/dali-toolkit/devel-api/layouting/measured-size.h index 3e38a1e..4acdd70 100644 --- a/dali-toolkit/devel-api/layouting/measured-size.h +++ b/dali-toolkit/devel-api/layouting/measured-size.h @@ -19,6 +19,7 @@ #include #include +#include namespace Dali { @@ -28,7 +29,7 @@ namespace Toolkit /** * Class that encodes a measurement and a measure state, which is set if the measured size is too small. */ -class DALI_IMPORT_API MeasuredSize +class DALI_TOOLKIT_API MeasuredSize { public: diff --git a/dali-toolkit/devel-api/layouting/vbox-layout.h b/dali-toolkit/devel-api/layouting/vbox-layout.h index f04a4bd..220872e 100644 --- a/dali-toolkit/devel-api/layouting/vbox-layout.h +++ b/dali-toolkit/devel-api/layouting/vbox-layout.h @@ -36,7 +36,7 @@ class VboxLayout; * This class implements a vertical box layout, automatically handling * right to left or left to right direction change. */ -class DALI_IMPORT_API VboxLayout : public LayoutGroup +class DALI_TOOLKIT_API VboxLayout : public LayoutGroup { public: