X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol.cpp;h=07170ff59a9262d6ddb5b7a065f538de3648caa3;hb=405f6216e6bb0c6c5e88a809452f5ecf490ea1ba;hp=415ffb637cee4d6a80848df4a3d3f8e5bc703d63;hpb=d13e8792c0e8dd0a3f5fb167ca9ee7c0155b7afc;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 415ffb6..07170ff 100644 --- a/dali-toolkit/public-api/controls/control.cpp +++ b/dali-toolkit/public-api/controls/control.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 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. @@ -23,6 +23,7 @@ // INTERNAL INCLUDES #include +#include namespace Dali { @@ -39,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 ) { @@ -109,26 +104,27 @@ const std::string& Control::GetStyleName() const void Control::SetBackgroundColor( const Vector4& color ) { - DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: SetBackgroundColor() is deprecated and will be removed from next release. use Property::BACKGROUND instead.\n" ); - Internal::GetImplementation(*this).SetBackgroundColor( color ); } -Vector4 Control::GetBackgroundColor() const +void Control::ClearBackground() { - 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(); + Internal::GetImplementation(*this).ClearBackground(); } -void Control::SetBackgroundImage( Image image ) +bool Control::IsResourceReady() const { - Internal::GetImplementation(*this).SetBackgroundImage( image ); + const Internal::Control& internalControl = Toolkit::Internal::GetImplementation( *this ); + const Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( internalControl ); + + return controlDataImpl.IsResourceReady(); } -void Control::ClearBackground() +Toolkit::Visual::ResourceStatus Control::GetVisualResourceStatus( Dali::Property::Index index ) { - Internal::GetImplementation(*this).ClearBackground(); + 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() @@ -146,6 +142,14 @@ Control::KeyInputFocusSignalType& Control::KeyInputFocusLostSignal() return Internal::GetImplementation(*this).KeyInputFocusLostSignal(); } +Control::ResourceReadySignalType& Control::ResourceReadySignal() +{ + Internal::Control& internalControl = Toolkit::Internal::GetImplementation( *this ); + Internal::Control::Impl& controlImpl = Internal::Control::Impl::Get( internalControl ); + + return controlImpl.mResourceReadySignal; +} + Control::Control(Internal::Control& implementation) : CustomActor(implementation) {