X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fcontrol-wrapper-impl.cpp;h=80287075fe8aee7d840d698d211992a4d51e4e57;hb=305b42da3085e8b4682ddadebdab7661148a0cb6;hp=d3fcc5698ce0237c9016f356a964496715280221;hpb=cb30ef68af0383b073ba2d425d3d95c1e916cbb4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp b/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp index d3fcc56..8028707 100755 --- a/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp +++ b/dali-toolkit/devel-api/controls/control-wrapper-impl.cpp @@ -1,5 +1,5 @@ /* - * 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. @@ -26,6 +26,7 @@ // INTERNAL INCLUDES #include +#include #include #include #include @@ -121,37 +122,47 @@ bool ControlWrapper::RelayoutDependentOnChildrenBase( Dimension::Type dimension void ControlWrapper::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual ) { - Control::RegisterVisual( index, visual ); + DevelControl::RegisterVisual( *this, index, visual ); +} + +void ControlWrapper::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, int depthIndex ) +{ + DevelControl::RegisterVisual( *this, index, visual, depthIndex ); } void ControlWrapper::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled ) { - Control::RegisterVisual( index, visual, enabled ); + DevelControl::RegisterVisual( *this, index, visual, enabled ); +} + +void ControlWrapper::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled, int depthIndex ) +{ + DevelControl::RegisterVisual( *this, index, visual, enabled, depthIndex ); } void ControlWrapper::UnregisterVisual( Property::Index index ) { - Control::UnregisterVisual( index ); + DevelControl::UnregisterVisual( *this, index ); } Toolkit::Visual::Base ControlWrapper::GetVisual( Property::Index index ) const { - return Control::GetVisual( index ); + return DevelControl::GetVisual( *this, index ); } void ControlWrapper::EnableVisual( Property::Index index, bool enable ) { - Control::EnableVisual( index, enable ); + DevelControl::EnableVisual( *this, index, enable ); } bool ControlWrapper::IsVisualEnabled( Property::Index index ) const { - return Control::IsVisualEnabled( index ); + return DevelControl::IsVisualEnabled( *this, index ); } Dali::Animation ControlWrapper::CreateTransition( const Toolkit::TransitionData& handle ) { - return Control::CreateTransition( handle ); + return DevelControl::CreateTransition( *this, handle ); } void ControlWrapper::ApplyThemeStyle()