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
2c3f3d4
..
fb09efd
100644
(file)
--- a/
dali/internal/event/common/scene-impl.h
+++ b/
dali/internal/event/common/scene-impl.h
@@
-120,6
+120,16
@@
public:
void SetSurface( Integration::RenderSurface& surface );
/**
void SetSurface( Integration::RenderSurface& surface );
/**
+ * Notify the surface has been resized.
+ */
+ void SurfaceResized();
+
+ /**
+ * @copydoc Dali::Integration::Scene::Discard
+ */
+ void Discard();
+
+ /**
* Retrieve the render surface the scene is binded to.
* @return The render surface.
*/
* Retrieve the render surface the scene is binded to.
* @return The render surface.
*/
@@
-154,10
+164,10
@@
public:
void RebuildDepthTree();
/**
void RebuildDepthTree();
/**
- * @brief Sets the background color of the render
surface.
+ * @brief Sets the background color of the render
surface.
* @param[in] color The new background color
*/
* @param[in] color The new background color
*/
- void SetBackgroundColor(
Vector4 color
);
+ void SetBackgroundColor(
const Vector4& color
);
/**
* @brief Gets the background color of the render surface.
/**
* @brief Gets the background color of the render surface.
@@
-172,13
+182,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()
@@
-203,11
+206,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()
*/
@@
-270,6
+268,8
@@
private:
Vector2 mDpi;
Vector2 mDpi;
+ Vector4 mBackgroundColor;
+
LayerPtr mRootLayer;
// Ordered list of currently on-stage layers
LayerPtr mRootLayer;
// Ordered list of currently on-stage layers
@@
-289,7
+289,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;