return false;
}
- Actor actor = Actor::DownCast( handle );
+ Actor actor = handle.GetHandle();
float animateByMultiplier = ( animatorType == Toolkit::LayoutTransitionData::Animator::Type::ANIMATE_BY ) ? 1.0f : 0.0f;
Vector3 size = actor.GetCurrentSize();
void LayoutDataElement::UpdatePropertyIndex()
{
- if( propertyIndex == -1 && handle && !propertyName.empty() )
+ if( propertyIndex == -1 && !propertyName.empty() )
{
- Actor actor = Actor::DownCast( handle );
- propertyIndex = DevelHandle::GetPropertyIndex( actor, Property::Key( propertyName ) );
+ Actor actor = handle.GetHandle();
+ if( actor )
+ {
+ propertyIndex = DevelHandle::GetPropertyIndex( actor, Property::Key( propertyName ) );
+ }
}
}
}
LayoutTransitionData::PropertyAnimator::PropertyAnimator( )
- : handle( Actor( ) )
+ : handle()
, map()
, interpolation( Animation::Linear )
{
// Add the children animators
for( const LayoutDataElement& iter : layoutData.childrenLayoutDataArray )
{
- if( iter.handle != nullptr && iter.handle != child )
+ Actor actor = iter.handle.GetHandle();
+ if( actor && actor != child )
{
continue;
}
LayoutDataElement layoutDataElement = iter;
+ Actor gainedChild = layoutData.layoutTransition.gainedChild.GetHandle();
+ Actor lostChild = layoutData.layoutTransition.lostChild.GetHandle();
switch ( layoutDataElement.condition )
{
case Dali::Toolkit::LayoutTransitionData::Condition::ON_ADD:
if ( layoutData.layoutTransition.layoutTransitionType != Dali::Toolkit::LayoutTransitionData::ON_CHILD_ADD
- || layoutData.layoutTransition.gainedChild != child )
+ || gainedChild != child )
{
continue;
}
break;
case Dali::Toolkit::LayoutTransitionData::Condition::ON_REMOVE:
if( layoutData.layoutTransition.layoutTransitionType != Dali::Toolkit::LayoutTransitionData::ON_CHILD_REMOVE
- || layoutData.layoutTransition.lostChild != child )
+ || lostChild != child )
{
continue;
}
break;
case Dali::Toolkit::LayoutTransitionData::Condition::ON_FOCUS_GAINED:
if( layoutData.layoutTransition.layoutTransitionType != Dali::Toolkit::LayoutTransitionData::ON_CHILD_FOCUS
- || layoutData.layoutTransition.gainedChild != child )
+ || gainedChild != child )
{
continue;
}
break;
case Dali::Toolkit::LayoutTransitionData::Condition::ON_FOCUS_LOST:
if( layoutData.layoutTransition.layoutTransitionType != Dali::Toolkit::LayoutTransitionData::ON_CHILD_FOCUS
- || layoutData.layoutTransition.lostChild != child )
+ || lostChild != child )
{
continue;
}
// Collect the transition animators
for( const LayoutDataElement& iter : mLayoutDataElements )
{
- if( iter.handle == nullptr || iter.handle != owner )
+ Actor actor = iter.handle.GetHandle();
+ if( !actor || actor != owner )
{
layoutData.childrenLayoutDataArray.push_back( iter );
continue;