projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move TouchPoint to Devel API
[platform/core/uifw/dali-adaptor.git]
/
dali
/
integration-api
/
adaptor-framework
/
adaptor.h
diff --git
a/dali/integration-api/adaptor-framework/adaptor.h
b/dali/integration-api/adaptor-framework/adaptor.h
old mode 100755
(executable)
new mode 100644
(file)
index
7ad1912
..
6985275
--- a/
dali/integration-api/adaptor-framework/adaptor.h
+++ b/
dali/integration-api/adaptor-framework/adaptor.h
@@
-23,8
+23,8
@@
#include <dali/public-api/signals/dali-signal.h>
#include <dali/public-api/math/uint-16-pair.h>
#include <dali/public-api/math/rect.h>
#include <dali/public-api/signals/dali-signal.h>
#include <dali/public-api/math/uint-16-pair.h>
#include <dali/public-api/math/rect.h>
-#include <dali/public-api/events/touch-event.h>
#include <dali/public-api/object/any.h>
#include <dali/public-api/object/any.h>
+#include <dali/devel-api/events/touch-point.h>
#include <dali/integration-api/processor-interface.h>
// INTERNAL INCLUDES
#include <dali/integration-api/processor-interface.h>
// INTERNAL INCLUDES
@@
-36,6
+36,7
@@
namespace Dali
{
namespace Dali
{
+class ObjectRegistry;
class RenderSurfaceInterface;
using WindowContainer = std::vector<Window>;
class RenderSurfaceInterface;
using WindowContainer = std::vector<Window>;
@@
-253,14
+254,8
@@
public:
* @brief Adds a new Window instance to the Adaptor
*
* @param[in] childWindow The child window instance
* @brief Adds a new Window instance to the Adaptor
*
* @param[in] childWindow The child window instance
- * @param[in] childWindowName The child window title/name
- * @param[in] childWindowClassName The class name that the child window belongs to
- * @param[in] childWindowMode The mode of the child window
*/
*/
- bool AddWindow( Dali::Integration::SceneHolder childWindow,
- const std::string& childWindowName,
- const std::string& childWindowClassName,
- bool childWindowMode );
+ bool AddWindow( Dali::Integration::SceneHolder childWindow );
/**
* @brief Removes a previously added @p callback.
/**
* @brief Removes a previously added @p callback.
@@
-477,6
+472,12
@@
public:
SceneHolderList GetSceneHolders() const;
/**
SceneHolderList GetSceneHolders() const;
/**
+ * @brief Gets the Object registry.
+ * @return The object registry
+ */
+ Dali::ObjectRegistry GetObjectRegistry() const;
+
+ /**
* @brief Called when the window becomes fully or partially visible.
*/
void OnWindowShown();
* @brief Called when the window becomes fully or partially visible.
*/
void OnWindowShown();