Wayland DPI and Multi-threading Wayland support

[platform/core/uifw/dali-adaptor.git] / adaptors / integration-api / adaptor.h

diff --git a/adaptors/integration-api/adaptor.h b/adaptors/integration-api/adaptor.h
index d5a1826..cc79c35 100644 (file)
--- a/adaptors/integration-api/adaptor.h
+++ b/adaptors/integration-api/adaptor.h
@@ -23,10 +23,20 @@
 #include <dali/public-api/signals/dali-signal.h>
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/events/touch-event.h>
+#include <dali/public-api/common/view-mode.h>
 
 // INTERNAL INCLUDES
-#include "window.h"
-#include "application-configuration.h"
+
+
+#ifdef DALI_ADAPTOR_COMPILATION  // full path doesn't exist until adaptor is installed so we have to use relative
+// @todo Make dali-adaptor code folder structure mirror the folder structure installed to dali-env
+#include <window.h>
+#include <application-configuration.h>
+#else
+#include <dali/public-api/adaptor-framework/window.h>
+#include <dali/public-api/adaptor-framework/application-configuration.h>
+#endif
+
 
 namespace Dali
 {
@@ -173,6 +183,7 @@ public:
 
   /**
    * @brief Ensures that the function passed in is called from the main loop when it is idle.
+   * @note Function must be called from the main event thread only.
    *
    * A callback of the following type may be used:
    * @code
@@ -294,6 +305,21 @@ public:
    */
   void FeedKeyEvent( KeyEvent& keyEvent );
 
+  /**
+   * @copydoc Dali::Core::SceneCreated();
+   */
+  void SceneCreated();
+
+  /**
+   * @copydoc Dali::Application::SetViewMode();
+   */
+  void SetViewMode( ViewMode viewMode );
+
+  /**
+   * @copydoc Dali::Application::SetStereoBase();
+   */
+  void SetStereoBase( float stereoBase );
+
 public:  // Signals
 
   /**