X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol.cpp;h=14205f908b10eab1ac6c3ea80e19bcac32880ced;hb=f20180dbb4cd52afb0305f2aa7889e81f55ef19e;hp=18eaeeb33a7a7a7b102b1b18b2b50b4ede77fa31;hpb=e1dfaa0c7f709144fd5018a73e78842e61708433;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 18eaeeb..14205f9 100644 --- a/dali-toolkit/public-api/controls/control.cpp +++ b/dali-toolkit/public-api/controls/control.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 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. @@ -18,8 +18,12 @@ // CLASS HEADER #include +// EXTERNAL INCLUDES +#include + // INTERNAL INCLUDES #include +#include namespace Dali { @@ -111,11 +115,15 @@ void Control::SetBackgroundColor( const Vector4& 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 ); } @@ -124,6 +132,21 @@ 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(); +} + +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(); @@ -139,6 +162,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) {