X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fcontrol-wrapper-impl.h;h=899a57560c9abfa231e2c67edcb6e47684671039;hp=fa9173f2720b7499ae2ba1d8784c3b25f32cca49;hb=eb3641c5f89d0ad118aff7862b1e7669ea9828d9;hpb=dcee19c07c4f38251b88ca0ad849c9a666cf20eb diff --git a/dali-toolkit/devel-api/controls/control-wrapper-impl.h b/dali-toolkit/devel-api/controls/control-wrapper-impl.h index fa9173f..899a575 100755 --- a/dali-toolkit/devel-api/controls/control-wrapper-impl.h +++ b/dali-toolkit/devel-api/controls/control-wrapper-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_CONTROL_WRAPPER_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -28,6 +28,13 @@ namespace Dali namespace Toolkit { +class TransitionData; + +namespace Visual +{ +class Base; +} + namespace Internal { @@ -64,9 +71,13 @@ public: /** * Create a new ControlWrapper. + * + * @param[in] typeName The name of the type that is registered with this control + * @param[in] controlWrapper The implementation of this control + * * @return A public handle to the newly allocated ControlWrapper. */ - static Dali::Toolkit::ControlWrapper New( ControlWrapper* controlWrapper ); + static Dali::Toolkit::ControlWrapper New( const std::string& typeName, ControlWrapper* controlWrapper ); public: // From CustomActorImpl @@ -100,37 +111,47 @@ public: // From CustomActorImpl public: // From Control /** - * @copydoc Dali::Toolkit::Internal::Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual ) + * @ref Dali::Toolkit::DevelControl::RegisterVisual() */ void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual ); /** - * @copydoc Dali::Toolkit::Internal::Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled ) + * @ref Dali::Toolkit::DevelControl::RegisterVisual() + */ + void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, int depthIndex ); + + /** + * @ref Dali::Toolkit::DevelControl::RegisterVisual() */ void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled ); /** - * @copydoc Dali::Toolkit::Internal::Control::UnregisterVisual() + * @ref Dali::Toolkit::DevelControl::RegisterVisual() + */ + void RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled, int depthIndex ); + + /** + * @ref Dali::Toolkit::DevelControl::UnregisterVisual() */ void UnregisterVisual( Property::Index index ); /** - * @copydoc Dali::Toolkit::Internal::Control::GetVisual() + * @ref Dali::Toolkit::DevelControl::GetVisual() */ Toolkit::Visual::Base GetVisual( Property::Index index ) const; /** - * @copydoc Dali::Toolkit::Internal::Control::EnableVisual() + * @ref Dali::Toolkit::DevelControl::EnableVisual() */ void EnableVisual( Property::Index index, bool enable ); /** - * @copydoc Dali::Toolkit::Internal::Control::IsVisualEnabled() + * @ref Dali::Toolkit::DevelControl::IsVisualEnabled() */ bool IsVisualEnabled( Property::Index index ) const; /** - * @copydoc Dali::Toolkit::Internal::Control::CreateTransition() + * @ref Dali::Toolkit::DevelControl::CreateTransition() */ Dali::Animation CreateTransition( const Toolkit::TransitionData& transitionData );