X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol.cpp;h=5d28b912426b99f3dfbda446ddc733328d403961;hb=6c3f5edbc48a8bed629b24d3f8cdf10b0675c14f;hp=415ffb637cee4d6a80848df4a3d3f8e5bc703d63;hpb=306ab4095235efd0289e9da4e3994f456cbda2aa;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..5d28b91 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) 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. @@ -23,6 +23,7 @@ // INTERNAL INCLUDES #include +#include namespace Dali { @@ -109,8 +110,6 @@ 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 ); } @@ -123,6 +122,8 @@ Vector4 Control::GetBackgroundColor() const 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 ); } @@ -131,6 +132,14 @@ void Control::ClearBackground() Internal::GetImplementation(*this).ClearBackground(); } +bool Control::IsResourceReady() const +{ + const Internal::Control& internalControl = Toolkit::Internal::GetImplementation( *this ); + const Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( internalControl ); + + return controlDataImpl.IsResourceReady(); +} + Control::KeyEventSignalType& Control::KeyEventSignal() { return Internal::GetImplementation(*this).KeyEventSignal(); @@ -146,6 +155,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) {