X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol.cpp;h=07170ff59a9262d6ddb5b7a065f538de3648caa3;hb=d886d0a7b8637b2ad52844096091b63991157ff3;hp=5d28b912426b99f3dfbda446ddc733328d403961;hpb=2aab2479f7e6d127df4de063328570cc247ce6d4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/control.cpp b/dali-toolkit/public-api/controls/control.cpp index 5d28b91..07170ff 100644 --- a/dali-toolkit/public-api/controls/control.cpp +++ b/dali-toolkit/public-api/controls/control.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -40,23 +40,17 @@ Control::Control() { } -Control::Control( const Control& uiControl ) -: CustomActor( uiControl ) -{ -} +Control::Control( const Control& uiControl ) = default; + +Control::Control( Control&& rhs ) = default; Control::~Control() { } -Control& Control::operator=( const Control& handle ) -{ - if( &handle != this ) - { - CustomActor::operator=( handle ); - } - return *this; -} +Control& Control::operator=( const Control& handle ) = default; + +Control& Control::operator=( Control&& rhs ) = default; Control Control::DownCast( BaseHandle handle ) { @@ -113,20 +107,6 @@ void Control::SetBackgroundColor( const Vector4& color ) Internal::GetImplementation(*this).SetBackgroundColor( color ); } -Vector4 Control::GetBackgroundColor() const -{ - DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: GetBackgroundColor() is deprecated and will be removed from next release. use Property::BACKGROUND instead.\n" ); - - return Internal::GetImplementation(*this).GetBackgroundColor(); -} - -void Control::SetBackgroundImage( Image image ) -{ - DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetBackgroundImage() is deprecated and will be removed from next release. use Property::BACKGROUND instead.\n" ); - - Internal::GetImplementation(*this).SetBackgroundImage( image ); -} - void Control::ClearBackground() { Internal::GetImplementation(*this).ClearBackground(); @@ -140,6 +120,13 @@ bool Control::IsResourceReady() const return controlDataImpl.IsResourceReady(); } +Toolkit::Visual::ResourceStatus Control::GetVisualResourceStatus( Dali::Property::Index index ) +{ + const Internal::Control& internalControl = Toolkit::Internal::GetImplementation( *this ); + const Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( internalControl ); + return controlDataImpl.GetVisualResourceStatus( index ); +} + Control::KeyEventSignalType& Control::KeyEventSignal() { return Internal::GetImplementation(*this).KeyEventSignal();