#include <dali/public-api/actors/layer.h>
#include <dali/public-api/render-tasks/render-task-list.h>
-#ifdef DALI_ADAPTOR_COMPILATION
-#include <dali/integration-api/scene-holder-impl.h>
-#else
-#include <dali/integration-api/adaptors/scene-holder-impl.h>
-#endif
-
// INTERNAL INCLUDES
-#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/public-api/adaptor-framework/window.h>
#include <dali/public-api/adaptor-framework/key-grab.h>
#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/window-system/common/event-handler.h>
namespace Dali
typedef Dali::Window::IndicatorSignalType IndicatorSignalType;
typedef Dali::Window::FocusSignalType FocusSignalType;
typedef Dali::Window::ResizedSignalType ResizedSignalType;
+ typedef Dali::Window::FocusChangeSignalType FocusChangeSignalType;
+ typedef Dali::Window::ResizeSignalType ResizeSignalType;
+ typedef Dali::DevelWindow::VisibilityChangedSignalType VisibilityChangedSignalType;
typedef Signal< void () > SignalType;
/**
*/
static Dali::Window Get( Dali::Actor actor );
+ /**
+ * @copydoc Dali::DevelWindow::SetParent()
+ */
+ void SetParent( Dali::Window& parent );
+
+ /**
+ * @copydoc Dali::DevelWindow::Unparent()
+ */
+ void Unparent();
+
+ /**
+ * @copydoc Dali::DevelWindow::GetParent()
+ */
+ Dali::Window GetParent();
+
public: // Dali::Internal::Adaptor::SceneHolder
/**
FocusSignalType& FocusChangedSignal() { return mFocusChangedSignal; }
/**
+ * @copydoc Dali::Window::WindowFocusChangedSignal()
+ */
+ FocusChangeSignalType& FocusChangeSignal() { return mFocusChangeSignal; }
+ /**
* @copydoc Dali::Window::ResizedSignal()
*/
ResizedSignalType& ResizedSignal() { return mResizedSignal; }
/**
- * This signal is emitted when the window is requesting to be deleted
+ * @copydoc Dali::Window::ResizedSignal()
*/
- SignalType& DeleteRequestSignal() { return mDeleteRequestSignal; }
+ ResizeSignalType& ResizeSignal() { return mResizeSignal; }
/**
- * @copydoc Dali::Window::SignalEventProcessingFinished()
+ * This signal is emitted when the window is requesting to be deleted
*/
- Dali::DevelWindow::EventProcessingFinishedSignalType& EventProcessingFinishedSignal() { return mScene.EventProcessingFinishedSignal(); };
+ SignalType& DeleteRequestSignal() { return mDeleteRequestSignal; }
/**
- * @copydoc Dali::Window::KeyEventSignal()
+ * @copydoc Dali::DevelWindow::VisibilityChangedSignal()
*/
- Dali::DevelWindow::KeyEventSignalType& KeyEventSignal() { return mScene.KeyEventSignal(); };
-
- /**
- * @copydoc Dali::Window::TouchSignal()
- */
- Dali::DevelWindow::TouchSignalType& TouchSignal() { return mScene.TouchSignal(); };
+ VisibilityChangedSignalType& VisibilityChangedSignal() { return mVisibilityChangedSignal; }
/**
- * @copydoc Dali::Window::WheelEventSignal()
+ * @copydoc Dali::Window::SignalEventProcessingFinished()
*/
- Dali::DevelWindow::WheelEventSignalType& WheelEventSignal() { return mScene.WheelEventSignal(); };
+ Dali::DevelWindow::EventProcessingFinishedSignalType& EventProcessingFinishedSignal() { return mScene.EventProcessingFinishedSignal(); }
private:
bool mOpaqueState:1;
bool mResizeEnabled:1;
Dali::Window::Type mType;
+ Dali::Window mParentWindow;
OrientationPtr mOrientation;
std::vector<Dali::Window::WindowOrientation> mAvailableOrientations;
FocusSignalType mFocusChangedSignal;
ResizedSignalType mResizedSignal;
SignalType mDeleteRequestSignal;
-
-
+ FocusChangeSignalType mFocusChangeSignal;
+ ResizeSignalType mResizeSignal;
+ VisibilityChangedSignalType mVisibilityChangedSignal;
};
} // namespace Adaptor