From: Adeel Kazmi <adeel.kazmi@samsung.com>
Date: Thu, 28 Jun 2018 16:33:58 +0000 (+0000)
Subject: Merge "Use Actor target size for default layout." into devel/master
X-Git-Tag: dali_1.3.30~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=5a436526e75ad9bef35e98614a00527fe5586f78;hp=-c

Merge "Use Actor target size for default layout." into devel/master
---

5a436526e75ad9bef35e98614a00527fe5586f78
diff --combined dali-toolkit/devel-api/layouting/layout-group-impl.cpp
index 7f8d9d0,67a673c..d28ec90
--- a/dali-toolkit/devel-api/layouting/layout-group-impl.cpp
+++ b/dali-toolkit/devel-api/layouting/layout-group-impl.cpp
@@@ -451,8 -451,7 +451,8 @@@ void LayoutGroup::ChildAddedToOwner( Ac
  {
    LayoutItemPtr childLayout;
    Toolkit::Control control = Toolkit::Control::DownCast( child );
 -  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutGroup::ChildAddedToOwner(%s)\n", control.GetName().c_str() );
 +
 +  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutGroup::ChildAddedToOwner control(%s)\n", control?control.GetName().c_str():"Invalid" );
  
    if( control ) // Can only support adding Controls, not Actors to layout
    {
@@@ -471,6 -470,18 +471,18 @@@
  #endif
        childControlDataImpl.SetLayout( *childLayout.Get() );
  
+       Vector3 size = child.GetTargetSize();
+       // If the size of the control is set explicitly make sure that the control size
+       // stays the same after the layout except it is over written with match parent specs.
+       if ( size.x != 0 )
+       {
+         childLayout->SetMinimumWidth( size.x );
+       }
+ 
+       if ( size.y != 0 )
+       {
+         childLayout->SetMinimumHeight( size.y );
+       }
        // Default layout data will be generated by Add().
      }
      else