projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "ImageView ResourceReady logic update" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
dummy-control.cpp
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
..
d0a9d03
100644
(file)
--- 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
@@
-265,6
+265,11
@@
void Impl::DummyControl::SetLayout( Property::Index visualIndex, Property::Map&
void Impl::DummyControl::OnRelayout( const Vector2& size, RelayoutContainer& container )
{
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 )
Property::Map emptyMap;
for( VisualIndices::iterator iter = mRegisteredVisualIndices.begin(); iter != mRegisteredVisualIndices.end() ; ++iter )
@@
-286,6
+291,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;
DummyControl DummyControl::New( bool override )
{
DummyControl control;