From: Seoyeon Kim Date: Mon, 5 Aug 2019 04:49:55 +0000 (+0900) Subject: [Tizen] Add KeyEventGeneratedSignal for Get KeyEvent normally X-Git-Tag: accepted/tizen/unified/20190806.000437~5 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=64663925f484822e7d27d68a3de4ef9067eb18ac [Tizen] Add KeyEventGeneratedSignal for Get KeyEvent normally This reverts commit e2df4853dbf744416fc454ea2e26f8450b6c8997. Change-Id: I63ea56cda79e57b7e8ea117caa6f43dde3240e08 --- diff --git a/dali/devel-api/adaptor-framework/window-devel.cpp b/dali/devel-api/adaptor-framework/window-devel.cpp index 17a2993..dd28579 100644 --- a/dali/devel-api/adaptor-framework/window-devel.cpp +++ b/dali/devel-api/adaptor-framework/window-devel.cpp @@ -55,6 +55,11 @@ KeyEventSignalType& KeyEventSignal( Window window ) return GetImplementation( window ).KeyEventSignal(); } +KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window ) +{ + return GetImplementation( window ).KeyEventGeneratedSignal(); +} + TouchSignalType& TouchSignal( Window window ) { return GetImplementation( window ).TouchSignal(); diff --git a/dali/devel-api/adaptor-framework/window-devel.h b/dali/devel-api/adaptor-framework/window-devel.h index 3da549e..e61381e 100644 --- a/dali/devel-api/adaptor-framework/window-devel.h +++ b/dali/devel-api/adaptor-framework/window-devel.h @@ -35,6 +35,8 @@ typedef Signal< void () > EventProcessingFinishedSignalType; ///< Event Pr typedef Signal< void (const KeyEvent&) > KeyEventSignalType; ///< Key event signal type +typedef Signal< bool (const KeyEvent&) > KeyEventGeneratedSignalType; ///< Key event generated signal type + typedef Signal< void (const TouchData&) > TouchSignalType; ///< Touch signal type typedef Signal< void (const WheelEvent&) > WheelEventSignalType; ///< Touched signal type @@ -84,6 +86,18 @@ DALI_ADAPTOR_API EventProcessingFinishedSignalType& EventProcessingFinishedSigna DALI_ADAPTOR_API KeyEventSignalType& KeyEventSignal( Window window ); /** + * @brief This signal is emitted when key event is received. + * + * A callback of the following type may be connected: + * @code + * bool YourCallbackName(const KeyEvent& event); + * @endcode + * @param[in] window The window instance + * @return The signal to connect to + */ +DALI_ADAPTOR_API KeyEventGeneratedSignalType& KeyEventGeneratedSignal( Window window ); + +/** * @brief This signal is emitted when the screen is touched and when the touch ends * (i.e. the down & up touch events only). * diff --git a/dali/internal/window-system/common/window-impl.h b/dali/internal/window-system/common/window-impl.h index 7fd04f9..97fc575 100644 --- a/dali/internal/window-system/common/window-impl.h +++ b/dali/internal/window-system/common/window-impl.h @@ -464,6 +464,11 @@ public: // Signals */ Dali::DevelWindow::KeyEventSignalType& KeyEventSignal() { return mScene.KeyEventSignal(); }; + /** + * @copydoc Dali::Window::KeyEventGeneratedSignal() + */ + Dali::DevelWindow::KeyEventGeneratedSignalType& KeyEventGeneratedSignal() { return mScene.KeyEventGeneratedSignal(); }; + /** * @copydoc Dali::Window::TouchSignal() */