{
// An object with a unique_ptr to an opaque structure must define it's destructor in the translation unit
// where the opaque structure is defined. It cannot use the default method in the header file.
+ RemoveAll();
}
Toolkit::LayoutGroup::LayoutId LayoutGroup::Add( LayoutItem& child )
// Get last stored width and height specifications for the child
auto desiredWidth = childOwner.GetProperty<int>( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION );
auto desiredHeight = childOwner.GetProperty<int>( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION );
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutGroup::MeasureChild desiredWidth(%d) desiredHeight(%d)\n", desiredWidth, desiredHeight );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutGroup::MeasureChild child WIDTH_SPEC(%d) child HEIGHT SPEC(%d)\n", desiredWidth, desiredHeight );
auto padding = GetPadding(); // Padding of this layout's owner, not of the child being measured.
auto padding = GetPadding(); // Padding of this layout's owner, not of the child being measured.
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutGroup::MeasureChildWithMargins desiredWidth(%d)\n", desiredWidth );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutGroup::MeasureChildWithMargins child WIDTH_SPEC(%d)\n", desiredWidth );
MeasureSpec childWidthMeasureSpec = GetChildMeasureSpec( parentWidthMeasureSpec,
LayoutLength( padding.start + padding.end ) +
widthUsed, desiredWidth );
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutGroup::MeasureChildWithMargins desiredHeight(%d)\n", desiredHeight );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutGroup::MeasureChildWithMargins child HEIGHT_SPEC(%d)\n", desiredHeight );
MeasureSpec childHeightMeasureSpec = GetChildMeasureSpec( parentHeightMeasureSpec,
LayoutLength( padding.top + padding.bottom )+
auto specMode = measureSpec.GetMode();
LayoutLength specSize = measureSpec.GetSize();
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutGroup::GetChildMeasureSpec childDimension(%f)\n", childDimension.AsInteger() );
+
LayoutLength size = std::max( LayoutLength(0), specSize - padding ); // reduce available size by the owners padding
LayoutLength resultSize = 0;
MeasureSpec::Mode resultMode = MeasureSpec::Mode::UNSPECIFIED;
- switch( specMode )
+ switch( specMode ) // Parents specMode
{
// Parent has imposed an exact size on us
case MeasureSpec::Mode::EXACTLY:
DevelActor::ChildAddedSignal( control ).Connect( mSlotDelegate, &LayoutGroup::ChildAddedToOwner );
DevelActor::ChildRemovedSignal( control ).Connect( mSlotDelegate, &LayoutGroup::ChildRemovedFromOwner );
- DevelActor::ChildOrderChangedSignal( control ).Connect( mSlotDelegate, &LayoutGroup::ChildOrderChanged );
DevelHandle::PropertySetSignal( control ).Connect( mSlotDelegate, &LayoutGroup::OnOwnerPropertySet );
if( control.GetParent() )
{
DevelActor::ChildAddedSignal( control ).Disconnect( mSlotDelegate, &LayoutGroup::ChildAddedToOwner );
DevelActor::ChildRemovedSignal( control ).Disconnect( mSlotDelegate, &LayoutGroup::ChildRemovedFromOwner );
- DevelActor::ChildOrderChangedSignal( control ).Disconnect( mSlotDelegate, &LayoutGroup::ChildOrderChanged );
DevelHandle::PropertySetSignal( control ).Disconnect( mSlotDelegate, &LayoutGroup::OnOwnerPropertySet );
}
}
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 )
+
+ auto childControl = Toolkit::Control::DownCast(childLayout->GetOwner());
+
+ bool setWidthExplictly = ( childControl.GetProperty<int>( Toolkit::LayoutItem::ChildProperty::WIDTH_SPECIFICATION ) > 0 );
+ if ( size.x != 0 || setWidthExplictly )
{
- childLayout->SetMinimumWidth( size.x );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutGroup::ChildAddedToOwner SetTargetWidth(%f)\n", size.x );
+ childLayout->SetTargetWidth( size.x );
}
- if ( size.y != 0 )
+ bool setHeightExplcitly = ( childControl.GetProperty<int>( Toolkit::LayoutItem::ChildProperty::HEIGHT_SPECIFICATION ) > 0 );
+ if ( size.y != 0 || setHeightExplcitly )
{
- childLayout->SetMinimumHeight( size.y );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "LayoutGroup::ChildAddedToOwner SetTargetHeight(%f)\n", size.y);
+ childLayout->SetTargetHeight( size.y );
}
// Default layout data will be generated by Add().
}
{
auto childOwner = childLayout->GetOwner();
+ if( !childLayout->IsLayoutAnimated() )
+ {
+ Actor actor = Actor::DownCast( childOwner );
+ if ( actor && DevelActor::IsPositionOrSizeCurrentlyAnimating( actor ) )
+ {
+ continue;
+ }
+ }
+
LayoutLength childWidth = childLayout->GetMeasuredWidth();
LayoutLength childHeight = childLayout->GetMeasuredHeight();
Extents childMargin = childLayout->GetMargin();