X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Fdummy-control.cpp;h=5e843c26cbb4a52420b652d5087f52f8c18df9b3;hp=0d54096a2de2df05eaca94322404bce9b98cbd10;hb=0ba4d17563f6d40d65b4d233b1a44a2d0a6fc709;hpb=c207c7aae76e4a6111656669fbed81052513b460 diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp index 0d54096..5e843c2 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.cpp @@ -19,8 +19,6 @@ #include #include -#include -#include #include namespace Dali @@ -157,6 +155,12 @@ Animation DummyControlImpl::CreateTransition( const Toolkit::TransitionData& tra return DevelControl::CreateTransition( *this, transition ); } +void DummyControlImpl::DoAction( Dali::Property::Index index, Dali::Property::Index action, const Dali::Property::Value attributes ) +{ + DummyControl control( *this ); + DevelControl::DoAction( control, index, action, attributes); +} + void DummyControlImpl::SetProperty( BaseObject* object, Dali::Property::Index index, const Dali::Property::Value& value ) { Toolkit::DummyControl control = Toolkit::DummyControl::DownCast( Dali::BaseHandle( object ) ); @@ -265,6 +269,11 @@ void Impl::DummyControl::SetLayout( Property::Index visualIndex, Property::Map& void Impl::DummyControl::OnRelayout( const Vector2& size, RelayoutContainer& container ) { + if ( mRelayoutCallback ) + { + mRelayoutCallback( size ); // Execute callback if set + } + Property::Map emptyMap; for( VisualIndices::iterator iter = mRegisteredVisualIndices.begin(); iter != mRegisteredVisualIndices.end() ; ++iter ) @@ -286,6 +295,12 @@ void Impl::DummyControl::OnRelayout( const Vector2& size, RelayoutContainer& con } } +void Impl::DummyControl::SetRelayoutCallback( RelayoutCallbackFunc callback ) +{ + mRelayoutCallback = callback; +} + + DummyControl DummyControl::New( bool override ) { DummyControl control;