X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=capi%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.h;h=e9c96f86c5698dc7cd76bc29ad15c27bf53e0112;hb=818994dc0acac601b0b27c0b715259b504ef4ceb;hp=42be06c7ac6abbdb856e74ec311fd4fec02fa874;hpb=aa19ec23c1186efea1585ed2dc19587714063e39;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/capi/dali-toolkit/public-api/controls/control-impl.h b/capi/dali-toolkit/public-api/controls/control-impl.h index 42be06c..e9c96f8 100644 --- a/capi/dali-toolkit/public-api/controls/control-impl.h +++ b/capi/dali-toolkit/public-api/controls/control-impl.h @@ -166,44 +166,6 @@ public: */ static bool DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes); -public: - - /** - * @copydoc Dali::Toolkit::Control::KeyEventSignal() - */ - Toolkit::Control::KeyEventSignalV2& KeyEventSignal(); - -protected: - - // Construction - - /** - * @brief Second phase initialization. - */ - void Initialize(); - - // Gesture Detection - - /** - * @brief Allows deriving classes to enable any of the gesture detectors that are available. - * - * Gesture detection can be enabled one at a time or in bitwise format as shown: - * @code - * EnableGestureDetection(Gesture::Type(Gesture::Pinch | Gesture::Tap | Gesture::Pan)); - * @endcode - * @param[in] type The gesture type(s) to enable. - */ - void EnableGestureDetection(Gesture::Type type); - - /** - * @brief Allows deriving classes to disable any of the gesture detectors. - * - * Like EnableGestureDetection, this can also be called using bitwise or. - * @param[in] type The gesture type(s) to disable. - * @see EnableGetureDetection - */ - void DisableGestureDetection(Gesture::Type type); - /** * @brief If deriving classes wish to fine tune pinch gesture * detection then they can access the gesture detector through this @@ -248,6 +210,44 @@ protected: */ LongPressGestureDetector GetLongPressGestureDetector() const; +public: + + /** + * @copydoc Dali::Toolkit::Control::KeyEventSignal() + */ + Toolkit::Control::KeyEventSignalV2& KeyEventSignal(); + +protected: + + // Construction + + /** + * @brief Second phase initialization. + */ + void Initialize(); + + // Gesture Detection + + /** + * @brief Allows deriving classes to enable any of the gesture detectors that are available. + * + * Gesture detection can be enabled one at a time or in bitwise format as shown: + * @code + * EnableGestureDetection(Gesture::Type(Gesture::Pinch | Gesture::Tap | Gesture::Pan)); + * @endcode + * @param[in] type The gesture type(s) to enable. + */ + void EnableGestureDetection(Gesture::Type type); + + /** + * @brief Allows deriving classes to disable any of the gesture detectors. + * + * Like EnableGestureDetection, this can also be called using bitwise or. + * @param[in] type The gesture type(s) to disable. + * @see EnableGetureDetection + */ + void DisableGestureDetection(Gesture::Type type); + private: // For derived classes to override /**