X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.h;h=e3d0676c23c1ee34a63d405b1e396a5401c0ef0a;hb=29540fc153880d6949c85786b78b8583ae8f1d37;hp=a7e2c91e2704e8a0c60237fda671fbaad4a68c1e;hpb=2cc8d741a802e8d79b4da15329aa8328b68c7c34;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index a7e2c91..f127317 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) 2020 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,16 +32,18 @@ namespace Dali { - namespace Toolkit { + +/** + * @addtogroup dali_toolkit_controls + * @{ + */ + class StyleManager; namespace Internal { -class FocusManager; -class KeyboardFocusManager; -class KeyInputFocusManager; /** * @brief This is the internal base class for all controls. @@ -49,8 +51,9 @@ class KeyInputFocusManager; * It will provide some common functionality required by all controls. * Implements ConnectionTrackerInterface so that signals (typically connected to member functions) will * 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: @@ -59,43 +62,85 @@ 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. - * @return A handle to the ControlImpl instance. + * 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 */ static Toolkit::Control New(); +protected: /** * @brief Virtual destructor. + * @SINCE_1_0.0 */ virtual ~Control(); - // Key Input +public: + // Styling /** - * @copydoc Toolkit::Control::SetKeyInputFocus() + * @copydoc Dali::Toolkit::Control::SetStyleName */ - void SetKeyInputFocus(); + void SetStyleName( const std::string& styleName ); /** - * @copydoc Toolkit::Control::HasKeyInputFocus() + * @copydoc Dali::Toolkit::Control::GetStyleName */ - bool HasKeyInputFocus(); + const std::string& GetStyleName() const; + + // Background /** - * @copydoc Toolkit::Control::ClearKeyInputFocus() + * @copydoc Dali::Toolkit::Control::SetBackgroundColor */ - void ClearKeyInputFocus(); + void SetBackgroundColor( const Vector4& color ); + + /** + * @brief Sets the background with a property map. + * + * @SINCE_1_0.0 + * @param[in] map The background property map + */ + void SetBackground(const Property::Map& map); + + /** + * @copydoc Dali::Toolkit::Control::ClearBackground + */ + void ClearBackground(); // 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 + * @SINCE_1_0.0 + * @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. + * @SINCE_1_0.0 + * @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. * - * @return The pinch gesture detector. + * @SINCE_1_0.0 + * @return The pinch gesture detector * @pre Pinch detection should have been enabled via EnableGestureDetection(). * @see EnableGestureDetection */ @@ -103,10 +148,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. * - * @return The pan gesture detector. + * @SINCE_1_0.0 + * @return The pan gesture detector * @pre Pan detection should have been enabled via EnableGestureDetection(). * @see EnableGestureDetection */ @@ -114,10 +160,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. * - * @return The tap gesture detector. + * @SINCE_1_0.0 + * @return The tap gesture detector * @pre Tap detection should have been enabled via EnableGestureDetection(). * @see EnableGestureDetection */ @@ -125,49 +172,16 @@ 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. * - * @return The long press gesture detector. + * @SINCE_1_0.0 + * @return The long press gesture detector * @pre Long press detection should have been enabled via EnableGestureDetection(). * @see EnableGestureDetection */ LongPressGestureDetector GetLongPressGestureDetector() const; - // Styling - - /** - * @copydoc Dali::Toolkit::Control::SetStyleName - */ - void SetStyleName( const std::string& styleName ); - - /** - * @copydoc Dali::Toolkit::Control::GetStyleName - */ - const std::string& GetStyleName() const; - - // Background - - /** - * @copydoc Dali::Toolkit::Control::SetBackgroundColor - */ - void SetBackgroundColor( const Vector4& color ); - - /** - * @copydoc Dali::Toolkit::Control::GetBackgroundColor - */ - Vector4 GetBackgroundColor() const; - - /** - * @copydoc Dali::Toolkit::Control::SetBackgroundImage - */ - void SetBackgroundImage( Image image ); - - /** - * @copydoc Dali::Toolkit::Control::ClearBackground - */ - void ClearBackground(); - // Keyboard Navigation /** @@ -176,23 +190,35 @@ public: * keyboard focus movement between its child actors). * * The control doesn't support it by default. - * @param[in] isSupported Whether this control supports two dimensional keyboard navigation. + * @SINCE_1_0.0 + * @param[in] isSupported Whether this control supports two dimensional keyboard navigation */ - void SetKeyboardNavigationSupport(bool isSupported); + void SetKeyboardNavigationSupport( bool isSupported ); /** * @brief Gets whether this control supports two dimensional keyboard navigation. * - * @return true if this control supports two dimensional keyboard navigation. + * @SINCE_1_0.0 + * @return true if this control supports two dimensional keyboard navigation */ bool IsKeyboardNavigationSupported(); - // Called by Focus Managers + // Key Input + + /** + * @copydoc Toolkit::Control::SetKeyInputFocus() + */ + void SetKeyInputFocus(); + + /** + * @copydoc Toolkit::Control::HasKeyInputFocus() + */ + bool HasKeyInputFocus(); /** - * @brief Called by the focus manager and keyboard focus manager to Activate the Control + * @copydoc Toolkit::Control::ClearKeyInputFocus() */ - DALI_INTERNAL void Activate(); + void ClearKeyInputFocus(); // Keyboard Focus @@ -200,49 +226,35 @@ 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. - * @param[in] isFocusGroup Whether this control is set as a focus group for keyboard navigation. + * 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 */ - void SetAsKeyboardFocusGroup(bool isFocusGroup); + void SetAsKeyboardFocusGroup( bool isFocusGroup ); /** * @brief Gets whether this control is a focus group for keyboard navigation. * - * @return true if this control is set as a focus group for keyboard navigation. + * @SINCE_1_0.0 + * @return true if this control is set as a focus group for keyboard navigation */ bool IsKeyboardFocusGroup(); + /// @cond internal /** - * @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. - * - * @param[in] focusGained True if gained, False if lost + * @brief Called by the AccessibilityManager to activate the Control. + * @SINCE_1_0.0 */ - void EmitKeyInputFocusSignal( bool focusGained ); - - // Actions & Signals + DALI_INTERNAL void AccessibilityActivate(); /** - * @brief Performs actions as requested using the action name. - * - * @param[in] object The object on which to perform the action. - * @param[in] actionName The action to perform. - * @param[in] attributes The attributes with which to perfrom this action. - * @return true if action has been accepted by this control + * @brief Called by the KeyboardFocusManager. + * @SINCE_1_0.0 */ - static bool DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes); + DALI_INTERNAL void KeyboardEnter(); + /// @endcond - /** - * Connects a callback function with the object's signals. - * @param[in] object The object providing the signal. - * @param[in] tracker Used to disconnect the signal. - * @param[in] signalName The signal to connect to. - * @param[in] functor A newly allocated FunctorDelegate. - * @return True if the signal was connected. - * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor. - */ - static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ); + // Signals /** * @copydoc Dali::Toolkit::Control::KeyEventSignal() @@ -259,120 +271,153 @@ public: */ Toolkit::Control::KeyInputFocusSignalType& KeyInputFocusLostSignal(); + /// @cond internal /** * @brief Called by the KeyInputFocusManager to emit key event signals. * - * @param[in] event The key event. - * @return True if the event was consumed. + * @SINCE_1_0.0 + * @param[in] event The key event + * @return True if the event was consumed */ - DALI_INTERNAL bool EmitKeyEventSignal(const KeyEvent& event); + DALI_INTERNAL bool EmitKeyEventSignal( const KeyEvent& event ); + /// @endcond + +protected: // For derived classes to call + + /** + * @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. + * + * @SINCE_1_0.0 + * @param[in] focusGained True if gained, False if lost + */ + void EmitKeyInputFocusSignal( bool focusGained ); -protected: // From CustomActorImpl, not to be used by application developers +protected: // From CustomActorImpl /** - * @copydoc CustomActorImpl::OnStageConnection() + * @copydoc CustomActorImpl::OnSceneConnection() + * @note If overridden, then an up-call to Control::OnSceneConnection MUST be made at the end. */ - virtual void OnStageConnection(); + virtual void OnSceneConnection( int depth ) override; /** - * @copydoc CustomActorImpl::OnStageDisconnection() + * @copydoc CustomActorImpl::OnSceneDisconnection() + * @note If overridden, then an up-call to Control::OnSceneDisconnection MUST be made at the end. */ - virtual void OnStageDisconnection(); + virtual void OnSceneDisconnection() override; /** * @copydoc CustomActorImpl::OnChildAdd() + * @note If overridden, then an up-call to Control::OnChildAdd MUST be made at the end. */ - virtual void OnChildAdd(Actor& child); + virtual void OnChildAdd( Actor& child ) override; /** * @copydoc CustomActorImpl::OnChildRemove() + * @note If overridden, then an up-call to Control::OnChildRemove MUST be made at the end. */ - virtual void OnChildRemove(Actor& child); + virtual void OnChildRemove( Actor& child ) override; + + /** + * @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 ) override; /** * @copydoc CustomActorImpl::OnSizeSet() + * @note If overridden, then an up-call to Control::OnSizeSet MUST be made at the end. */ - virtual void OnSizeSet(const Vector3& targetSize); + virtual void OnSizeSet( const Vector3& targetSize ) override; /** * @copydoc CustomActorImpl::OnSizeAnimation() + * @note If overridden, then an up-call to Control::OnSizeAnimation MUST be made at the end. */ - virtual void OnSizeAnimation(Animation& animation, const Vector3& targetSize); + virtual void OnSizeAnimation( Animation& animation, const Vector3& targetSize ) override; /** * @copydoc CustomActorImpl::OnTouchEvent() */ - virtual bool OnTouchEvent(const TouchEvent& event); + virtual bool OnTouchEvent( const TouchEvent& event ) override; /** * @copydoc CustomActorImpl::OnHoverEvent() */ - virtual bool OnHoverEvent(const HoverEvent& event); + virtual bool OnHoverEvent( const HoverEvent& event ) override; /** * @copydoc CustomActorImpl::OnKeyEvent() */ - virtual bool OnKeyEvent(const KeyEvent& event); + virtual bool OnKeyEvent( const KeyEvent& event ) override; /** - * @copydoc CustomActorImpl::OnMouseWheelEvent() + * @copydoc CustomActorImpl::OnWheelEvent() */ - virtual bool OnMouseWheelEvent(const MouseWheelEvent& event); + virtual bool OnWheelEvent( const WheelEvent& event ) override; /** * @copydoc CustomActorImpl::OnRelayout() */ - virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ); + virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ) override; /** * @copydoc CustomActorImpl::OnSetResizePolicy() */ - virtual void OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ); + virtual void OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) override; /** * @copydoc CustomActorImpl::GetNaturalSize() */ - virtual Vector3 GetNaturalSize(); + virtual Vector3 GetNaturalSize() override; /** * @copydoc CustomActorImpl::CalculateChildSize() */ - virtual float CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ); + virtual float CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) override; /** * @copydoc CustomActorImpl::GetHeightForWidth() */ - virtual float GetHeightForWidth( float width ); + virtual float GetHeightForWidth( float width ) override; /** * @copydoc CustomActorImpl::GetWidthForHeight() */ - virtual float GetWidthForHeight( float height ); + virtual float GetWidthForHeight( float height ) override; /** * @copydoc CustomActorImpl::RelayoutDependentOnChildren() */ - virtual bool RelayoutDependentOnChildren( Dimension::Type dimension = Dimension::ALL_DIMENSIONS ); + virtual bool RelayoutDependentOnChildren( Dimension::Type dimension = Dimension::ALL_DIMENSIONS ) override; /** * @copydoc CustomActorImpl::OnCalculateRelayoutSize() */ - virtual void OnCalculateRelayoutSize( Dimension::Type dimension ); + virtual void OnCalculateRelayoutSize( Dimension::Type dimension ) override; /** * @copydoc CustomActorImpl::OnLayoutNegotiated() */ - virtual void OnLayoutNegotiated( float size, Dimension::Type dimension ); + virtual void OnLayoutNegotiated( float size, Dimension::Type dimension ) override; 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 - REQUIRES_KEYBOARD_NAVIGATION_SUPPORT = 1 << ( CustomActorImpl::ACTOR_FLAG_COUNT + 1 ), ///< True if needs to support keyboard navigation + 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 }; @@ -380,39 +425,19 @@ protected: // Helpers for deriving classes 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 */ Control( ControlBehaviour behaviourFlags ); /** * @brief Second phase initialization. + * @SINCE_1_0.0 */ 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 ); - public: // API for derived classes to override // Lifecycle @@ -421,95 +446,70 @@ public: // API for derived classes to override * @brief This method is called after the Control has been initialized. * * Derived classes should do any second phase initialization by overriding this method. + * @SINCE_1_0.0 */ virtual void OnInitialize(); - /** - * @brief Called whenever the control is added to the stage. - * - * Could be overridden by derived classes. - */ - virtual void OnControlStageConnection(); - - /** - * @brief Called whenever the control is removed from the stage. - * - * Could be overridden by derived classes. - */ - virtual void OnControlStageDisconnection(); - - /** - * @brief Called whenever an Actor is added to the control. - * - * Could be overridden by derived classes. - * - * @param[in] child The added actor. - */ - virtual void OnControlChildAdd( Actor& child ); - - /** - * @brief Called whenever an Actor is removed from the control. - * - * Could be overridden by derived classes. - * - * @param[in] child The removed actor. - */ - virtual void OnControlChildRemove( Actor& child ); - // Styling /** * @brief This method should be overridden by deriving classes requiring notifications when the style changes. * - * @param[in] styleManager The StyleManager object. - * @param[in] change Information denoting what has changed. + * @SINCE_1_0.0 + * @param[in] styleManager The StyleManager object + * @param[in] change Information denoting what has changed */ virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ); - // Size negotiation - - /** - * @brief Called whenever the Control's size is set. - * - * @param[in] size The new size. - */ - virtual void OnControlSizeSet( const Vector3& size ); - // Accessibility /** * @brief This method is called when the control is accessibility activated. * * Derived classes should override this to perform custom accessibility activation. + * @SINCE_1_0.0 + * @return true if this control can perform accessibility activation */ - virtual void OnAccessibilityActivated(); + virtual bool OnAccessibilityActivated(); /** * @brief This method should be overridden by deriving classes when they wish to respond the accessibility * pan gesture. * - * @param[in] gesture The pan gesture. + * @SINCE_1_0.0 + * @param[in] gesture The pan gesture * @return true if the pan gesture has been consumed by this control */ - virtual bool OnAccessibilityPan(PanGesture gesture); + virtual bool OnAccessibilityPan( PanGesture gesture ); /** * @brief This method should be overridden by deriving classes when they wish to respond the accessibility * touch event. * - * @param[in] touchEvent The touch event. + * @SINCE_1_0.0 + * @param[in] touchEvent The touch event * @return true if the touch event has been consumed by this control */ - virtual bool OnAccessibilityTouch(const TouchEvent& touchEvent); + virtual bool OnAccessibilityTouch( const TouchEvent& touchEvent ); /** * @brief This method should be overridden by deriving classes when they wish to respond * the accessibility up and down action (i.e. value change of slider control). * + * @SINCE_1_0.0 * @param[in] isIncrease Whether the value should be increased or decreased * @return true if the value changed action has been consumed by this control */ - virtual bool OnAccessibilityValueChange(bool isIncrease); + virtual bool OnAccessibilityValueChange( bool isIncrease ); + + /** + * @brief This method should be overridden by deriving classes when they wish to respond + * the accessibility zoom action. + * + * @SINCE_1_0.0 + * @return true if the zoom action has been consumed by this control + */ + virtual bool OnAccessibilityZoom(); // Keyboard focus @@ -517,6 +517,7 @@ public: // API for derived classes to override * @brief Called when the control gains key input focus. * * Should be overridden by derived classes if they need to customize what happens when focus is gained. + * @SINCE_1_0.0 */ virtual void OnKeyInputFocusGained(); @@ -524,6 +525,7 @@ public: // API for derived classes to override * @brief Called when the control loses key input focus. * * Should be overridden by derived classes if they need to customize what happens when focus is lost. + * @SINCE_1_0.0 */ virtual void OnKeyInputFocusLost(); @@ -531,22 +533,33 @@ public: // API for derived classes to override * @brief Gets the next keyboard focusable actor in this control towards the given direction. * * A control needs to override this function in order to support two dimensional keyboard navigation. - * @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. + * @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 */ - virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled); + 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. * - * @param[in] commitedFocusableActor The commited focusable actor. + * @SINCE_1_0.0 + * @param[in] commitedFocusableActor The commited focusable actor + */ + virtual void OnKeyboardFocusChangeCommitted( Actor commitedFocusableActor ); + + /** + * @brief This method is called when the control has enter pressed on it. + * + * Derived classes should override this to perform custom actions. + * @SINCE_1_0.0 + * @return true if this control supported this action */ - virtual void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor); + virtual bool OnKeyboardEnter(); // Gestures @@ -557,12 +570,13 @@ public: // API for derived classes to override * is enabled. The default behaviour is to scale the control by the * pinch scale. * - * @note If overridden, then the default behaviour will not occur. + * @SINCE_1_0.0 + * @param[in] pinch The pinch gesture + * @note If overridden, then the default behavior will not occur. * @note Pinch detection should be enabled via EnableGestureDetection(). - * @param[in] pinch The pinch gesture. * @see EnableGestureDetection */ - virtual void OnPinch(const PinchGesture& pinch); + virtual void OnPinch( const PinchGesture& pinch ); /** * @brief Called whenever a pan gesture is detected on this control. @@ -570,9 +584,10 @@ public: // API for derived classes to override * This should be overridden by deriving classes when pan detection * is enabled. * - * @note There is no default behaviour with panning. + * @SINCE_1_0.0 + * @param[in] pan The pan gesture + * @note There is no default behavior with panning. * @note Pan detection should be enabled via EnableGestureDetection(). - * @param[in] pan The pan gesture. * @see EnableGestureDetection */ virtual void OnPan( const PanGesture& pan ); @@ -583,9 +598,10 @@ public: // API for derived classes to override * This should be overridden by deriving classes when tap detection * is enabled. * - * @note There is no default behaviour with a tap. + * @SINCE_1_0.0 + * @param[in] tap The tap gesture + * @note There is no default behavior with a tap. * @note Tap detection should be enabled via EnableGestureDetection(). - * @param[in] tap The tap gesture. * @see EnableGestureDetection */ virtual void OnTap( const TapGesture& tap ); @@ -596,9 +612,10 @@ public: // API for derived classes to override * This should be overridden by deriving classes when long press * detection is enabled. * + * @SINCE_1_0.0 + * @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(). - * @param[in] longPress The long press gesture. * @see EnableGestureDetection */ virtual void OnLongPress( const LongPressGesture& longPress ); @@ -616,8 +633,9 @@ public: // API for derived classes to override virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback ); /** - * Retrieve the extension for this control + * @brief Retrieves the extension for this control. * + * @SINCE_1_0.0 * @return The extension if available, NULL otherwise */ virtual Extension* GetControlExtension() @@ -627,37 +645,47 @@ public: // API for derived classes to override private: + /// @cond internal // Undefined - DALI_INTERNAL Control(const Control&); - DALI_INTERNAL Control& operator=(const Control&); + 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. * - * @pre handle is initialized and points to a control + * @SINCE_1_0.0 * @param handle - * @return implementation + * @return Implementation + * @pre handle is initialized and points to a control */ -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. * - * @pre handle is initialized and points to a control + * @SINCE_1_0.0 * @param handle - * @return implementation + * @return Implementation + * @pre Handle is initialized and points to a control. */ -const Internal::Control& GetImplementation( const Dali::Toolkit::Control& handle ); +DALI_TOOLKIT_API const Internal::Control& GetImplementation( const Dali::Toolkit::Control& handle ); } // namespace Internal +/** + * @} + */ } // namespace Toolkit } // namespace Dali -#endif // __DALI_TOOLKIT_CONTROL_IMPL_H__ +#endif // DALI_TOOLKIT_CONTROL_IMPL_H