Merge "Fix nested layout issue" into devel/master
authorDavid Steele <david.steele@samsung.com>
Wed, 20 Jun 2018 11:09:47 +0000 (11:09 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 20 Jun 2018 11:09:47 +0000 (11:09 +0000)
1  2 
dali-toolkit/devel-api/layouting/layout-item-impl.h
dali-toolkit/devel-api/layouting/layout-parent-impl.h

@@@ -44,8 -44,8 +44,8 @@@ using LayoutItemPtr = IntrusivePtr<Layo
  /**
   * 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 +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;
@@@ -17,8 -17,6 +17,8 @@@
   * limitations under the License.
   */
  
 +#include <dali-toolkit/public-api/dali-toolkit-common.h>
 +
  namespace Dali
  {
  namespace Toolkit
@@@ -32,10 -30,15 +32,15 @@@ namespace Interna
   * 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:
    /**
+    * Set the parent of this layout.
+    */
+   virtual void SetParent( LayoutParent* parent ) = 0;
+   /**
     * Get the parent of this layout.
     */
    virtual LayoutParent* GetParent() = 0;