projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] Add KeyEventGeneratedSignal for Get KeyEvent normally"
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
common
/
scene-impl.h
diff --git
a/dali/internal/event/common/scene-impl.h
b/dali/internal/event/common/scene-impl.h
index
166ef09
..
2c93c84
100644
(file)
--- a/
dali/internal/event/common/scene-impl.h
+++ b/
dali/internal/event/common/scene-impl.h
@@
-62,7
+62,7
@@
public:
/**
* @copydoc Dali::Integration::Scene::New
*/
/**
* @copydoc Dali::Integration::Scene::New
*/
- static ScenePtr New(
const Size& siz
e );
+ static ScenePtr New(
Integration::RenderSurface& surfac
e );
/**
* virtual destructor
/**
* virtual destructor
@@
-125,6
+125,11
@@
public:
void SurfaceResized();
/**
void SurfaceResized();
/**
+ * Notify the surface has been deleted.
+ */
+ void SurfaceDeleted();
+
+ /**
* @copydoc Dali::Integration::Scene::Discard
*/
void Discard();
* @copydoc Dali::Integration::Scene::Discard
*/
void Discard();
@@
-182,13
+187,6
@@
public:
void EmitKeyEventSignal(const KeyEvent& event);
/**
void EmitKeyEventSignal(const KeyEvent& event);
/**
- * Used by the KeyEventProcessor to emit KeyEventGenerated signals.
- * @param[in] event The key event.
- * @return The return is true if KeyEvent is consumed, otherwise false.
- */
- bool EmitKeyEventGeneratedSignal(const KeyEvent& event);
-
- /**
* Emits the event processing finished signal.
*
* @see Dali::Scene::SignalEventProcessingFinished()
* Emits the event processing finished signal.
*
* @see Dali::Scene::SignalEventProcessingFinished()
@@
-213,11
+211,6
@@
public:
*/
Integration::Scene::KeyEventSignalType& KeyEventSignal();
*/
Integration::Scene::KeyEventSignalType& KeyEventSignal();
- /**
- * @copydoc Integration::Scene::KeyEventGeneratedSignal()
- */
- Integration::Scene::KeyEventGeneratedSignalType& KeyEventGeneratedSignal();
-
/**
* @copydoc Integration::Scene::SignalEventProcessingFinished()
*/
/**
* @copydoc Integration::Scene::SignalEventProcessingFinished()
*/
@@
-258,12
+251,12
@@
public:
private:
// Constructor
private:
// Constructor
- Scene(
const Size& size
);
+ Scene();
/**
* Second-phase constructor.
*/
/**
* Second-phase constructor.
*/
- void Initialize();
+ void Initialize(
Integration::RenderSurface& surface
);
// Undefined
Scene(const Scene&) = delete;
// Undefined
Scene(const Scene&) = delete;
@@
-274,9
+267,7
@@
private:
private:
Integration::RenderSurface* mSurface;
private:
Integration::RenderSurface* mSurface;
- // The scene-size may be different with the surface-size
Size mSize;
Size mSize;
- Size mSurfaceSize;
Vector2 mDpi;
Vector2 mDpi;
@@
-301,7
+292,6
@@
private:
// The key event signal
Integration::Scene::KeyEventSignalType mKeyEventSignal;
// The key event signal
Integration::Scene::KeyEventSignalType mKeyEventSignal;
- Integration::Scene::KeyEventGeneratedSignalType mKeyEventGeneratedSignal;
// The event processing finished signal
Integration::Scene::EventProcessingFinishedSignalType mEventProcessingFinishedSignal;
// The event processing finished signal
Integration::Scene::EventProcessingFinishedSignalType mEventProcessingFinishedSignal;