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 "Add Delete Key event in TextController" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
dummy-control.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
index
7b43bd0
..
69a5c88
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h
@@
-21,6
+21,9
@@
// INTERNAL INCLUDES
#include <dali-toolkit/dali-toolkit.h>
// INTERNAL INCLUDES
#include <dali-toolkit/dali-toolkit.h>
+// EXTERNAL INCLUDES
+#include <functional>
+
namespace Dali
{
namespace Dali
{
@@
-102,6
+105,7
@@
public:
int GetVisualCount();
Toolkit::Visual::Base GetVisual( Property::Index index );
Animation CreateTransition( const Toolkit::TransitionData& transition );
int GetVisualCount();
Toolkit::Visual::Base GetVisual( Property::Index index );
Animation CreateTransition( const Toolkit::TransitionData& transition );
+ void DoAction( Dali::Property::Index index, Dali::Property::Index action, const Dali::Property::Value attributes );
static void SetProperty( BaseObject* object, Dali::Property::Index index, const Dali::Property::Value& value );
static void SetProperty( BaseObject* object, Dali::Property::Index index, const Dali::Property::Value& value );
@@
-132,10
+136,14
@@
class DummyControl : public Toolkit::DummyControlImpl
{
public:
{
public:
+ typedef std::function<void( Size )> RelayoutCallbackFunc;
+
static Toolkit::DummyControl New();
void SetLayout( Property::Index visualIndex, Property::Map& map );
static Toolkit::DummyControl New();
void SetLayout( Property::Index visualIndex, Property::Map& map );
+ void SetRelayoutCallback( RelayoutCallbackFunc callback );
+
private:
DummyControl();
private:
DummyControl();
@@
-200,6
+208,8
@@
public:
bool keyInputFocusLost;
Property::Map mLayouts;
bool keyInputFocusLost;
Property::Map mLayouts;
+ RelayoutCallbackFunc mRelayoutCallback;
+
};
} // namespace Impl
};
} // namespace Impl