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=6717f5b7962a032c55339eb8965554024f7ab32b;hp=053a8ecb439f585e895482287b2ec70d739c9a2f;hb=9110280c0e5a01128f3eb1e35f1587b9f596d95d;hpb=736d0519550d784c776d594936af1c60f2670a14 diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index 053a8ec..6717f5b 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_CONTROL_IMPL_H /* - * Copyright (c) 2019 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. @@ -34,7 +34,6 @@ namespace Dali { namespace Toolkit { - /** * @addtogroup dali_toolkit_controls * @{ @@ -44,7 +43,6 @@ class StyleManager; namespace Internal { - /** * @brief This is the internal base class for all controls. * @@ -56,7 +54,6 @@ namespace Internal class DALI_TOOLKIT_API Control : public CustomActorImpl, public ConnectionTrackerInterface { public: - class Extension; ///< Forward declare future extension interface // Creation & Destruction @@ -83,7 +80,7 @@ public: /** * @copydoc Dali::Toolkit::Control::SetStyleName */ - void SetStyleName( const std::string& styleName ); + void SetStyleName(const std::string& styleName); /** * @copydoc Dali::Toolkit::Control::GetStyleName @@ -95,17 +92,7 @@ public: /** * @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 ); + void SetBackgroundColor(const Vector4& color); /** * @brief Sets the background with a property map. @@ -127,12 +114,12 @@ public: * * 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)); + * EnableGestureDetection(GestureType::Value(GestureType::PINCH | GestureType::TAP | GestureType::PAN)); * @endcode * @SINCE_1_0.0 * @param[in] type The gesture type(s) to enable */ - void EnableGestureDetection( Gesture::Type type ); + void EnableGestureDetection(GestureType::Value type); /** * @brief Allows deriving classes to disable any of the gesture detectors. @@ -142,7 +129,7 @@ public: * @param[in] type The gesture type(s) to disable * @see EnableGetureDetection */ - void DisableGestureDetection( Gesture::Type type ); + void DisableGestureDetection(GestureType::Value type); /** * @brief If deriving classes wish to fine tune pinch gesture @@ -203,7 +190,7 @@ public: * @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. @@ -240,7 +227,7 @@ public: * @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. @@ -289,11 +276,10 @@ public: * @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. * @@ -302,119 +288,97 @@ protected: // For derived classes to call * @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 + void EmitKeyInputFocusSignal(bool focusGained); +protected: // From CustomActorImpl /** - * @copydoc CustomActorImpl::OnStageConnection() - * @note If overridden, then an up-call to Control::OnStageConnection MUST be made at the end. + * @copydoc CustomActorImpl::OnSceneConnection() + * @note If overridden, then an up-call to Control::OnSceneConnection MUST be made at the end. */ - virtual void OnStageConnection( int depth ); + void OnSceneConnection(int depth) override; /** - * @copydoc CustomActorImpl::OnStageDisconnection() - * @note If overridden, then an up-call to Control::OnStageDisconnection MUST be made at the end. + * @copydoc CustomActorImpl::OnSceneDisconnection() + * @note If overridden, then an up-call to Control::OnSceneDisconnection MUST be made at the end. */ - virtual void OnStageDisconnection(); + 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 ); + 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 ); + 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 ); + void OnPropertySet(Property::Index index, const 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 ); + 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 ); - - /** - * @copydoc CustomActorImpl::OnTouchEvent() - */ - virtual bool OnTouchEvent( const TouchEvent& event ); - - /** - * @copydoc CustomActorImpl::OnHoverEvent() - */ - virtual bool OnHoverEvent( const HoverEvent& event ); - - /** - * @copydoc CustomActorImpl::OnKeyEvent() - */ - virtual bool OnKeyEvent( const KeyEvent& event ); - - /** - * @copydoc CustomActorImpl::OnWheelEvent() - */ - virtual bool OnWheelEvent( const WheelEvent& event ); + void OnSizeAnimation(Animation& animation, const Vector3& targetSize) override; /** * @copydoc CustomActorImpl::OnRelayout() */ - virtual void OnRelayout( const Vector2& size, RelayoutContainer& container ); + void OnRelayout(const Vector2& size, RelayoutContainer& container) override; /** * @copydoc CustomActorImpl::OnSetResizePolicy() */ - virtual void OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ); + void OnSetResizePolicy(ResizePolicy::Type policy, Dimension::Type dimension) override; /** * @copydoc CustomActorImpl::GetNaturalSize() */ - virtual Vector3 GetNaturalSize(); + Vector3 GetNaturalSize() override; /** * @copydoc CustomActorImpl::CalculateChildSize() */ - virtual float CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ); + float CalculateChildSize(const Dali::Actor& child, Dimension::Type dimension) override; /** * @copydoc CustomActorImpl::GetHeightForWidth() */ - virtual float GetHeightForWidth( float width ); + float GetHeightForWidth(float width) override; /** * @copydoc CustomActorImpl::GetWidthForHeight() */ - virtual float GetWidthForHeight( float height ); + float GetWidthForHeight(float height) override; /** * @copydoc CustomActorImpl::RelayoutDependentOnChildren() */ - virtual bool RelayoutDependentOnChildren( Dimension::Type dimension = Dimension::ALL_DIMENSIONS ); + bool RelayoutDependentOnChildren(Dimension::Type dimension = Dimension::ALL_DIMENSIONS) override; /** * @copydoc CustomActorImpl::OnCalculateRelayoutSize() */ - virtual void OnCalculateRelayoutSize( Dimension::Type dimension ); + void OnCalculateRelayoutSize(Dimension::Type dimension) override; /** * @copydoc CustomActorImpl::OnLayoutNegotiated() */ - virtual void OnLayoutNegotiated( float size, Dimension::Type dimension ); + void OnLayoutNegotiated(float size, Dimension::Type dimension) override; protected: // Helpers for deriving classes - // Construction /** @@ -424,15 +388,14 @@ protected: // Helpers for deriving classes enum ControlBehaviour { 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 + NOT_IN_USE_1 = 1 << (CustomActorImpl::ACTOR_FLAG_COUNT + 0), + 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 + static const int CONTROL_BEHAVIOUR_FLAG_COUNT = Log::value + 1; ///< Total count of flags /** * @brief Control constructor. @@ -440,7 +403,7 @@ protected: // Helpers for deriving classes * @SINCE_1_0.0 * @param[in] behaviourFlags Behavioural flags from ControlBehaviour enum */ - Control( ControlBehaviour behaviourFlags ); + Control(ControlBehaviour behaviourFlags); /** * @brief Second phase initialization. @@ -449,7 +412,6 @@ protected: // Helpers for deriving classes void Initialize(); public: // API for derived classes to override - // Lifecycle /** @@ -460,30 +422,6 @@ public: // API for derived classes to override */ virtual void OnInitialize(); - /** - * @DEPRECATED_1_1.30. Override OnChildAdd instead. - * - * @brief Called whenever an Actor is added to the control. - * - * Could be overridden by derived classes. - * - * @SINCE_1_0.0 - * @param[in] child The added actor - */ - virtual void OnControlChildAdd( Actor& child ) DALI_DEPRECATED_API; - - /** - * @DEPRECATED_1_1.30. Override OnChildRemove instead. - * - * @brief Called whenever an Actor is removed from the control. - * - * Could be overridden by derived classes. - * - * @SINCE_1_0.0 - * @param[in] child The removed actor - */ - virtual void OnControlChildRemove( Actor& child ) DALI_DEPRECATED_API; - // Styling /** @@ -493,7 +431,7 @@ public: // API for derived classes to override * @param[in] styleManager The StyleManager object * @param[in] change Information denoting what has changed */ - virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ); + virtual void OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change); // Accessibility @@ -514,17 +452,7 @@ public: // API for derived classes to override * @param[in] gesture The pan gesture * @return true if the pan gesture has been consumed by this control */ - virtual bool OnAccessibilityPan( PanGesture gesture ); - - /** - * @brief This method should be overridden by deriving classes when they wish to respond the accessibility - * 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 OnAccessibilityPan(PanGesture gesture); /** * @brief This method should be overridden by deriving classes when they wish to respond @@ -534,7 +462,7 @@ public: // API for derived classes to override * @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 @@ -573,7 +501,7 @@ public: // API for derived classes to override * @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 ); + virtual Actor GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled); /** * @brief Informs this control that its chosen focusable actor will be focused. @@ -584,7 +512,7 @@ public: // API for derived classes to override * @SINCE_1_0.0 * @param[in] commitedFocusableActor The commited focusable actor */ - virtual void OnKeyboardFocusChangeCommitted( Actor commitedFocusableActor ); + virtual void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor); /** * @brief This method is called when the control has enter pressed on it. @@ -595,6 +523,15 @@ public: // API for derived classes to override */ virtual bool OnKeyboardEnter(); + /** + * @brief Called after a key-event is received by the actor that has had its focus set. + * + * @SINCE_1_0.0 + * @param[in] event The Key Event + * @return True if the event should be consumed + */ + virtual bool OnKeyEvent(const KeyEvent& event); + // Gestures /** @@ -610,7 +547,7 @@ public: // API for derived classes to override * @note Pinch detection should be enabled via EnableGestureDetection(). * @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. @@ -624,7 +561,7 @@ public: // API for derived classes to override * @note Pan detection should be enabled via EnableGestureDetection(). * @see EnableGestureDetection */ - virtual void OnPan( const PanGesture& pan ); + virtual void OnPan(const PanGesture& pan); /** * @brief Called whenever a tap gesture is detected on this control. @@ -638,7 +575,7 @@ public: // API for derived classes to override * @note Tap detection should be enabled via EnableGestureDetection(). * @see EnableGestureDetection */ - virtual void OnTap( const TapGesture& tap ); + virtual void OnTap(const TapGesture& tap); /** * @brief Called whenever a long press gesture is detected on this control. @@ -652,19 +589,19 @@ public: // API for derived classes to override * @note Long press detection should be enabled via EnableGestureDetection(). * @see EnableGestureDetection */ - virtual void OnLongPress( const LongPressGesture& longPress ); + virtual void OnLongPress(const LongPressGesture& longPress); // From ConnectionTrackerInterface /** * @copydoc ConnectionTrackerInterface::SignalConnected */ - virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ); + void SignalConnected(SlotObserver* slotObserver, CallbackBase* callback) override; /** * @copydoc ConnectionTrackerInterface::SignalDisconnected */ - virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback ); + void SignalDisconnected(SlotObserver* slotObserver, CallbackBase* callback) override; /** * @brief Retrieves the extension for this control. @@ -678,11 +615,13 @@ public: // API for derived classes to override } private: - /// @cond internal - // Undefined - DALI_INTERNAL Control( const Control& ); - DALI_INTERNAL Control& operator=( const Control& ); + + // Not copyable or movable + DALI_INTERNAL Control(const Control&) = delete; ///< Deleted copy constructor. + DALI_INTERNAL Control(Control&&) = delete; ///< Deleted move constructor. + DALI_INTERNAL Control& operator=(const Control&) = delete; ///< Deleted copy assignment operator. + DALI_INTERNAL Control& operator=(Control&&) = delete; ///< Deleted move assignment operator. public: class DALI_INTERNAL Impl; // Class declaration is public so we can internally add devel API's to the Controls Impl @@ -690,7 +629,6 @@ public: private: Impl* mImpl; /// @endcond - }; /** @@ -701,7 +639,7 @@ private: * @return Implementation * @pre handle is initialized and points to a control */ -DALI_TOOLKIT_API Internal::Control& GetImplementation( Dali::Toolkit::Control& handle ); +DALI_TOOLKIT_API Internal::Control& GetImplementation(Dali::Toolkit::Control& handle); /** * @brief Gets implementation from the handle. @@ -711,7 +649,7 @@ DALI_TOOLKIT_API Internal::Control& GetImplementation( Dali::Toolkit::Control& h * @return Implementation * @pre Handle is initialized and points to a control. */ -DALI_TOOLKIT_API const Internal::Control& GetImplementation( const Dali::Toolkit::Control& handle ); +DALI_TOOLKIT_API const Internal::Control& GetImplementation(const Dali::Toolkit::Control& handle); } // namespace Internal