X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fintegration-api%2Fscene.h;h=4e44caf9f10c1e05611282eb0f5369bbf28aabf4;hb=182acae4df2a65a6876414c9540a3633a18911ff;hp=092b6c355f83562679e41c2b56c07a293870219c;hpb=1e406489333bc9fbf0d6beaca0c3919231b80fc9;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/integration-api/scene.h b/dali/integration-api/scene.h old mode 100644 new mode 100755 index 092b6c3..4e44caf --- a/dali/integration-api/scene.h +++ b/dali/integration-api/scene.h @@ -26,11 +26,11 @@ namespace Dali { class Actor; -class KeyEvent; +struct KeyEvent; class Layer; class RenderTaskList; class TouchData; -class WheelEvent; +struct WheelEvent; namespace Internal DALI_INTERNAL { @@ -54,6 +54,7 @@ class DALI_CORE_API Scene : public BaseHandle public: typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Processing finished signal type typedef Signal< void (const Dali::KeyEvent&) > KeyEventSignalType; ///< Key event signal type + typedef Signal< bool (const Dali::KeyEvent&) > KeyEventGeneratedSignalType; ///< key event generated signal type typedef Signal< void (const Dali::TouchData&) > TouchSignalType; ///< Touch signal type typedef Signal< void (const Dali::WheelEvent&) > WheelEventSignalType; ///< Touched signal type @@ -114,7 +115,7 @@ public: * @pre The actor has been initialized. * @pre The actor does not have a parent. */ - void Add(Actor& actor); + void Add(Actor actor); /** * @brief Removes a child Actor from the Scene. @@ -123,7 +124,7 @@ public: * @param[in] actor The child * @pre The actor has been added to the stage. */ - void Remove(Actor& actor); + void Remove(Actor actor); /** * @brief Returns the size of the Scene in pixels as a Vector. @@ -194,6 +195,12 @@ public: Integration::RenderSurface* GetSurface() const; /** + * @brief Retrieve the Scene that the given actor belongs to. + * @return The Scene. + */ + static Integration::Scene Get( Actor actor ); + + /** * This function is called when an event is queued. * @param[in] event A event to queue. */ @@ -223,6 +230,13 @@ public: KeyEventSignalType& KeyEventSignal(); /** + * @brief The user would connect to this signal to get a KeyEvent when KeyEvent is generated. + * + * @return The return is true if KeyEvent is consumed, otherwise false. + */ + KeyEventGeneratedSignalType& KeyEventGeneratedSignal(); + + /** * @brief This signal is emitted when the screen is touched and when the touch ends * (i.e. the down & up touch events only). *