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=160ac557badaa8b41836e7364af637d2f873b75a;hp=f2e4402d6cfe4cb6a1ad4dcf43e06c067707c6ce;hb=a20d9e623d8829d526481e560763add7aa96f40b;hpb=6510379ea0355c08dfe00ad9221b8fb404418702 diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index f2e4402..160ac55 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. @@ -294,114 +294,109 @@ protected: // For derived classes to call */ void EmitKeyInputFocusSignal( bool focusGained ); -protected: // From CustomActorImpl, not to be used by application developers +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 ); + virtual 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(); + 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 ); + 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 ); - - /** - * @copydoc CustomActorImpl::OnTouchEvent() - */ - virtual bool OnTouchEvent( const TouchEvent& event ); + virtual void OnSizeAnimation( Animation& animation, const Vector3& targetSize ) 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::OnWheelEvent() */ - virtual bool OnWheelEvent( const WheelEvent& 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 @@ -450,30 +445,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 /** @@ -507,16 +478,6 @@ public: // API for derived classes to override 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 ); - - /** * @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). * @@ -649,12 +610,12 @@ public: // API for derived classes to override /** * @copydoc ConnectionTrackerInterface::SignalConnected */ - virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ); + virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ) override; /** * @copydoc ConnectionTrackerInterface::SignalDisconnected */ - virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback ); + virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback ) override; /** * @brief Retrieves the extension for this control. @@ -670,9 +631,12 @@ 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