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 integration-api folder from adaptors to adaptor-framework
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
window-system
/
common
/
window-impl.h
diff --git
a/dali/internal/window-system/common/window-impl.h
b/dali/internal/window-system/common/window-impl.h
index
f09e7ca
..
8513fb1
100644
(file)
--- a/
dali/internal/window-system/common/window-impl.h
+++ b/
dali/internal/window-system/common/window-impl.h
@@
-24,17
+24,12
@@
#include <dali/public-api/actors/layer.h>
#include <dali/public-api/render-tasks/render-task-list.h>
#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
// 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/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
#include <dali/internal/window-system/common/event-handler.h>
namespace Dali
@@
-65,6
+60,9
@@
public:
typedef Dali::Window::IndicatorSignalType IndicatorSignalType;
typedef Dali::Window::FocusSignalType FocusSignalType;
typedef Dali::Window::ResizedSignalType ResizedSignalType;
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;
/**
typedef Signal< void () > SignalType;
/**
@@
-460,34
+458,33
@@
public: // Signals
FocusSignalType& FocusChangedSignal() { return mFocusChangedSignal; }
/**
FocusSignalType& FocusChangedSignal() { return mFocusChangedSignal; }
/**
+ * @copydoc Dali::Window::WindowFocusChangedSignal()
+ */
+ FocusChangeSignalType& FocusChangeSignal() { return mFocusChangeSignal; }
+ /**
* @copydoc Dali::Window::ResizedSignal()
*/
ResizedSignalType& ResizedSignal() { return mResizedSignal; }
/**
* @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 mDeleteRequest
Signal; }
+
ResizeSignalType& ResizeSignal() { return mResize
Signal; }
/**
/**
- *
@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::KeyEvent
Signal()
+ * @copydoc Dali::
DevelWindow::VisibilityChanged
Signal()
*/
*/
- 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:
private:
@@
-518,8
+515,9
@@
private:
FocusSignalType mFocusChangedSignal;
ResizedSignalType mResizedSignal;
SignalType mDeleteRequestSignal;
FocusSignalType mFocusChangedSignal;
ResizedSignalType mResizedSignal;
SignalType mDeleteRequestSignal;
-
-
+ FocusChangeSignalType mFocusChangeSignal;
+ ResizeSignalType mResizeSignal;
+ VisibilityChangedSignalType mVisibilityChangedSignal;
};
} // namespace Adaptor
};
} // namespace Adaptor