X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.h;h=053a8ecb439f585e895482287b2ec70d739c9a2f;hp=4779d5866d83227881256c2a5dafbba25f330bc4;hb=6b0a98e24583f4334c9edf2f0cb7f9070577e66f;hpb=e9d852fcdacc5788785bfe0b617bd757794e8208 diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index 4779d58..053a8ec 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_CONTROL_IMPL_H__ -#define __DALI_TOOLKIT_CONTROL_IMPL_H__ +#ifndef DALI_TOOLKIT_CONTROL_IMPL_H +#define DALI_TOOLKIT_CONTROL_IMPL_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,9 +32,9 @@ namespace Dali { - namespace Toolkit { + /** * @addtogroup dali_toolkit_controls * @{ @@ -44,6 +44,7 @@ class StyleManager; namespace Internal { + /** * @brief This is the internal base class for all controls. * @@ -52,7 +53,7 @@ namespace Internal * be disconnected automatically when the control is destroyed. * @SINCE_1_0.0 */ -class DALI_IMPORT_API Control : public CustomActorImpl, public ConnectionTrackerInterface +class DALI_TOOLKIT_API Control : public CustomActorImpl, public ConnectionTrackerInterface { public: @@ -61,20 +62,22 @@ public: // Creation & Destruction /** - * @brief Create a new ControlImpl instance that does not require touch by default. + * @brief Creates a new ControlImpl instance that does not require touch by default. * - * If touch is required then the user can connect to this class' touch signal. + * If touch is required, then the user can connect to this class' touch signal. * @SINCE_1_0.0 - * @return A handle to the ControlImpl instance. + * @return A handle to the ControlImpl instance */ static Toolkit::Control New(); +protected: /** * @brief Virtual destructor. * @SINCE_1_0.0 */ virtual ~Control(); +public: // Styling /** @@ -105,10 +108,10 @@ public: void SetBackgroundImage( Image image ); /** - * @brief Set the background with a property map. + * @brief Sets the background with a property map. * * @SINCE_1_0.0 - * @param[in] map The background property map. + * @param[in] map The background property map */ void SetBackground(const Property::Map& map); @@ -127,7 +130,7 @@ public: * EnableGestureDetection(Gesture::Type(Gesture::Pinch | Gesture::Tap | Gesture::Pan)); * @endcode * @SINCE_1_0.0 - * @param[in] type The gesture type(s) to enable. + * @param[in] type The gesture type(s) to enable */ void EnableGestureDetection( Gesture::Type type ); @@ -136,18 +139,18 @@ public: * * Like EnableGestureDetection, this can also be called using bitwise or. * @SINCE_1_0.0 - * @param[in] type The gesture type(s) to disable. + * @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 + * detection, then they can access the gesture detector through this * API and modify the detection. * * @SINCE_1_0.0 - * @return The pinch gesture detector. + * @return The pinch gesture detector * @pre Pinch detection should have been enabled via EnableGestureDetection(). * @see EnableGestureDetection */ @@ -155,11 +158,11 @@ public: /** * @brief If deriving classes wish to fine tune pan gesture - * detection then they can access the gesture detector through this + * detection, then they can access the gesture detector through this * API and modify the detection. * * @SINCE_1_0.0 - * @return The pan gesture detector. + * @return The pan gesture detector * @pre Pan detection should have been enabled via EnableGestureDetection(). * @see EnableGestureDetection */ @@ -167,11 +170,11 @@ public: /** * @brief If deriving classes wish to fine tune tap gesture - * detection then they can access the gesture detector through this + * detection, then they can access the gesture detector through this * API and modify the detection. * * @SINCE_1_0.0 - * @return The tap gesture detector. + * @return The tap gesture detector * @pre Tap detection should have been enabled via EnableGestureDetection(). * @see EnableGestureDetection */ @@ -179,11 +182,11 @@ public: /** * @brief If deriving classes wish to fine tune long press gesture - * detection then they can access the gesture detector through this + * detection, then they can access the gesture detector through this * API and modify the detection. * * @SINCE_1_0.0 - * @return The long press gesture detector. + * @return The long press gesture detector * @pre Long press detection should have been enabled via EnableGestureDetection(). * @see EnableGestureDetection */ @@ -198,7 +201,7 @@ public: * * The control doesn't support it by default. * @SINCE_1_0.0 - * @param[in] isSupported Whether this control supports two dimensional keyboard navigation. + * @param[in] isSupported Whether this control supports two dimensional keyboard navigation */ void SetKeyboardNavigationSupport( bool isSupported ); @@ -206,7 +209,7 @@ public: * @brief Gets whether this control supports two dimensional keyboard navigation. * * @SINCE_1_0.0 - * @return true if this control supports two dimensional keyboard navigation. + * @return true if this control supports two dimensional keyboard navigation */ bool IsKeyboardNavigationSupported(); @@ -233,9 +236,9 @@ public: * @brief Sets whether this control is a focus group for keyboard navigation. * * (i.e. the scope of keyboard focus movement - * can be limitied to its child actors). The control is not a focus group by default. + * can be limited to its child actors). The control is not a focus group by default. * @SINCE_1_0.0 - * @param[in] isFocusGroup Whether this control is set as a focus group for keyboard navigation. + * @param[in] isFocusGroup Whether this control is set as a focus group for keyboard navigation */ void SetAsKeyboardFocusGroup( bool isFocusGroup ); @@ -243,10 +246,11 @@ public: * @brief Gets whether this control is a focus group for keyboard navigation. * * @SINCE_1_0.0 - * @return true if this control is set as a focus group for keyboard navigation. + * @return true if this control is set as a focus group for keyboard navigation */ bool IsKeyboardFocusGroup(); + /// @cond internal /** * @brief Called by the AccessibilityManager to activate the Control. * @SINCE_1_0.0 @@ -258,6 +262,7 @@ public: * @SINCE_1_0.0 */ DALI_INTERNAL void KeyboardEnter(); + /// @endcond // Signals @@ -276,19 +281,21 @@ public: */ Toolkit::Control::KeyInputFocusSignalType& KeyInputFocusLostSignal(); + /// @cond internal /** * @brief Called by the KeyInputFocusManager to emit key event signals. * * @SINCE_1_0.0 - * @param[in] event The key event. - * @return True if the event was consumed. + * @param[in] event The key event + * @return True if the event was consumed */ DALI_INTERNAL bool EmitKeyEventSignal( const KeyEvent& event ); + /// @endcond protected: // For derived classes to call /** - * @brief Emits KeyInputFocusGained signal if true else emits KeyInputFocusLost signal + * @brief Emits KeyInputFocusGained signal if true else emits KeyInputFocusLost signal. * * Should be called last by the control after it acts on the Input Focus change. * @@ -301,7 +308,7 @@ protected: // From CustomActorImpl, not to be used by application developers /** * @copydoc CustomActorImpl::OnStageConnection() - * @note If overridden, then an up-call to Control::OnStageConnection MUST be made at the start. + * @note If overridden, then an up-call to Control::OnStageConnection MUST be made at the end. */ virtual void OnStageConnection( int depth ); @@ -313,7 +320,7 @@ protected: // From CustomActorImpl, not to be used by application developers /** * @copydoc CustomActorImpl::OnChildAdd() - * @note If overridden, then an up-call to Control::OnChildAdd MUST be made at the start. + * @note If overridden, then an up-call to Control::OnChildAdd MUST be made at the end. */ virtual void OnChildAdd( Actor& child ); @@ -324,14 +331,20 @@ protected: // From CustomActorImpl, not to be used by application developers virtual void OnChildRemove( Actor& child ); /** + * @copydoc CustomActorImpl::OnPropertySet() + * @note If overridden, then an up-call to Control::OnChildRemove MUST be made at the end. + */ + virtual void OnPropertySet( Property::Index index, Property::Value propertyValue ); + + /** * @copydoc CustomActorImpl::OnSizeSet() - * @note If overridden, then an up-call to Control::OnSizeSet MUST be made at the start. + * @note If overridden, then an up-call to Control::OnSizeSet MUST be made at the end. */ virtual void OnSizeSet( const Vector3& targetSize ); /** * @copydoc CustomActorImpl::OnSizeAnimation() - * @note If overridden, then an up-call to Control::OnSizeAnimation MUST be made at the start. + * @note If overridden, then an up-call to Control::OnSizeAnimation MUST be made at the end. */ virtual void OnSizeAnimation( Animation& animation, const Vector3& targetSize ); @@ -404,19 +417,25 @@ protected: // Helpers for deriving classes // Construction - // Flags for the constructor + /** + * @brief Flags for the constructor. + * @SINCE_1_0.0 + */ enum ControlBehaviour { - REQUIRES_STYLE_CHANGE_SIGNALS = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 0 ), ///< True if needs to monitor style change signals such as theme/font change @SINCE_1_0.0 + CONTROL_BEHAVIOUR_DEFAULT = 0, ///< Default behaviour: Size negotiation is enabled & listens to Style Change signal, but doesn't receive event callbacks. @SINCE_1_2_10 + REQUIRES_STYLE_CHANGE_SIGNALS = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 0 ), ///< True if needs to monitor style change signals such as theme/font change @SINCE_1_0.0 @DEPRECATED_1_2_10 REQUIRES_KEYBOARD_NAVIGATION_SUPPORT = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 1 ), ///< True if needs to support keyboard navigation @SINCE_1_0.0 + DISABLE_STYLE_CHANGE_SIGNALS = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 2 ), ///< True if control should not monitor style change signals @SINCE_1_2_10 + LAST_CONTROL_BEHAVIOUR_FLAG }; static const int CONTROL_BEHAVIOUR_FLAG_COUNT = Log< LAST_CONTROL_BEHAVIOUR_FLAG - 1 >::value + 1; ///< Total count of flags /** - * @brief Control constructor + * @brief Control constructor. * * @SINCE_1_0.0 * @param[in] behaviourFlags Behavioural flags from ControlBehaviour enum @@ -449,9 +468,9 @@ public: // API for derived classes to override * Could be overridden by derived classes. * * @SINCE_1_0.0 - * @param[in] child The added actor. + * @param[in] child The added actor */ - virtual void OnControlChildAdd( Actor& child ); + virtual void OnControlChildAdd( Actor& child ) DALI_DEPRECATED_API; /** * @DEPRECATED_1_1.30. Override OnChildRemove instead. @@ -461,9 +480,9 @@ public: // API for derived classes to override * Could be overridden by derived classes. * * @SINCE_1_0.0 - * @param[in] child The removed actor. + * @param[in] child The removed actor */ - virtual void OnControlChildRemove( Actor& child ); + virtual void OnControlChildRemove( Actor& child ) DALI_DEPRECATED_API; // Styling @@ -471,8 +490,8 @@ public: // API for derived classes to override * @brief This method should be overridden by deriving classes requiring notifications when the style changes. * * @SINCE_1_0.0 - * @param[in] styleManager The StyleManager object. - * @param[in] change Information denoting what has changed. + * @param[in] styleManager The StyleManager object + * @param[in] change Information denoting what has changed */ virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ); @@ -483,7 +502,7 @@ public: // API for derived classes to override * * Derived classes should override this to perform custom accessibility activation. * @SINCE_1_0.0 - * @return true if this control can perform accessibility activation. + * @return true if this control can perform accessibility activation */ virtual bool OnAccessibilityActivated(); @@ -492,7 +511,7 @@ public: // API for derived classes to override * pan gesture. * * @SINCE_1_0.0 - * @param[in] gesture The pan gesture. + * @param[in] gesture The pan gesture * @return true if the pan gesture has been consumed by this control */ virtual bool OnAccessibilityPan( PanGesture gesture ); @@ -502,7 +521,7 @@ public: // API for derived classes to override * touch event. * * @SINCE_1_0.0 - * @param[in] touchEvent The touch event. + * @param[in] touchEvent The touch event * @return true if the touch event has been consumed by this control */ virtual bool OnAccessibilityTouch( const TouchEvent& touchEvent ); @@ -549,21 +568,21 @@ public: // API for derived classes to override * * A control needs to override this function in order to support two dimensional keyboard navigation. * @SINCE_1_0.0 - * @param[in] currentFocusedActor The current focused actor. - * @param[in] direction The direction to move the focus towards. - * @param[in] loopEnabled Whether the focus movement should be looped within the control. - * @return the next keyboard focusable actor in this control or an empty handle if no actor can be focused. + * @param[in] currentFocusedActor The current focused actor + * @param[in] direction The direction to move the focus towards + * @param[in] loopEnabled Whether the focus movement should be looped within the control + * @return The next keyboard focusable actor in this control or an empty handle if no actor can be focused */ virtual Actor GetNextKeyboardFocusableActor( Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled ); /** * @brief Informs this control that its chosen focusable actor will be focused. * - * This allows the application to preform any actions if wishes + * This allows the application to perform any actions if wishes * before the focus is actually moved to the chosen actor. * * @SINCE_1_0.0 - * @param[in] commitedFocusableActor The commited focusable actor. + * @param[in] commitedFocusableActor The commited focusable actor */ virtual void OnKeyboardFocusChangeCommitted( Actor commitedFocusableActor ); @@ -572,7 +591,7 @@ public: // API for derived classes to override * * Derived classes should override this to perform custom actions. * @SINCE_1_0.0 - * @return true if this control supported this action. + * @return true if this control supported this action */ virtual bool OnKeyboardEnter(); @@ -586,8 +605,8 @@ public: // API for derived classes to override * pinch scale. * * @SINCE_1_0.0 - * @param[in] pinch The pinch gesture. - * @note If overridden, then the default behaviour will not occur. + * @param[in] pinch The pinch gesture + * @note If overridden, then the default behavior will not occur. * @note Pinch detection should be enabled via EnableGestureDetection(). * @see EnableGestureDetection */ @@ -600,8 +619,8 @@ public: // API for derived classes to override * is enabled. * * @SINCE_1_0.0 - * @param[in] pan The pan gesture. - * @note There is no default behaviour with panning. + * @param[in] pan The pan gesture + * @note There is no default behavior with panning. * @note Pan detection should be enabled via EnableGestureDetection(). * @see EnableGestureDetection */ @@ -614,8 +633,8 @@ public: // API for derived classes to override * is enabled. * * @SINCE_1_0.0 - * @param[in] tap The tap gesture. - * @note There is no default behaviour with a tap. + * @param[in] tap The tap gesture + * @note There is no default behavior with a tap. * @note Tap detection should be enabled via EnableGestureDetection(). * @see EnableGestureDetection */ @@ -628,7 +647,7 @@ public: // API for derived classes to override * detection is enabled. * * @SINCE_1_0.0 - * @param[in] longPress The long press gesture. + * @param[in] longPress The long press gesture * @note There is no default behaviour associated with a long press. * @note Long press detection should be enabled via EnableGestureDetection(). * @see EnableGestureDetection @@ -648,7 +667,7 @@ public: // API for derived classes to override virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback ); /** - * @brief Retrieve the extension for this control + * @brief Retrieves the extension for this control. * * @SINCE_1_0.0 * @return The extension if available, NULL otherwise @@ -660,34 +679,39 @@ public: // API for derived classes to override private: + /// @cond internal // Undefined DALI_INTERNAL Control( const Control& ); DALI_INTERNAL Control& operator=( const Control& ); - class Impl; +public: + class DALI_INTERNAL Impl; // Class declaration is public so we can internally add devel API's to the Controls Impl + +private: Impl* mImpl; + /// @endcond }; /** - * @brief Get implementation from the handle. + * @brief Gets implementation from the handle. * * @SINCE_1_0.0 * @param handle - * @return implementation + * @return Implementation * @pre handle is initialized and points to a control */ -DALI_IMPORT_API Internal::Control& GetImplementation( Dali::Toolkit::Control& handle ); +DALI_TOOLKIT_API Internal::Control& GetImplementation( Dali::Toolkit::Control& handle ); /** - * @brief Get implementation from the handle. + * @brief Gets implementation from the handle. * * @SINCE_1_0.0 * @param handle - * @return implementation - * @pre handle is initialized and points to a control + * @return Implementation + * @pre Handle is initialized and points to a control. */ -DALI_IMPORT_API const Internal::Control& GetImplementation( const Dali::Toolkit::Control& handle ); +DALI_TOOLKIT_API const Internal::Control& GetImplementation( const Dali::Toolkit::Control& handle ); } // namespace Internal @@ -698,4 +722,4 @@ DALI_IMPORT_API const Internal::Control& GetImplementation( const Dali::Toolkit: } // namespace Dali -#endif // __DALI_TOOLKIT_CONTROL_IMPL_H__ +#endif // DALI_TOOLKIT_CONTROL_IMPL_H