X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-impl.cpp;h=d483ef516f0b20184d23366b8224f989bb3bf389;hp=bfd529352b3fa4483df7d4ee31148e395683dfd3;hb=b81849b1d366b03595dec285264ecbd8b6f1801e;hpb=dfebb1e3da197e21bd7f4424ab65884b98f42fea diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp index bfd5293..d483ef5 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp @@ -334,11 +334,6 @@ bool Visual::Base::IsOnStage() const return mImpl->mFlags & Impl::IS_ON_STAGE; } -bool Visual::Base::IsFromCache() const -{ - return mImpl->mFlags & Impl::IS_FROM_CACHE; -} - void Visual::Base::RegisterMixColor() { // Only register if not already registered. @@ -406,6 +401,37 @@ const Vector4& Visual::Base::GetMixColor() const return mImpl->mMixColor; } +void Visual::Base::AddResourceObserver( Visual::ResourceObserver& observer) +{ + mImpl->mResourceObserver = &observer; +} + +void Visual::Base::RemoveResourceObserver( Visual::ResourceObserver& observer ) +{ + mImpl->mResourceObserver = NULL; +} + +void Visual::Base::ResourceReady() +{ + if( mImpl->mResourceReady ) + { + // only inform the observer the first time the resource is ready + return; + } + mImpl->mResourceReady = true; + + if( mImpl->mResourceObserver ) + { + // observer is currently a control impl + mImpl->mResourceObserver->ResourceReady( *this ); + } +} + +bool Visual::Base::IsResourceReady() const +{ + return mImpl->mResourceReady; +} + Renderer Visual::Base::GetRenderer() { return mImpl->mRenderer; @@ -495,8 +521,11 @@ void Visual::Base::AnimateProperty( Property::Map map; DoCreatePropertyMap( map ); Property::Value* valuePtr = map.Find( Toolkit::DevelVisual::Property::TYPE ); - int visualType; - valuePtr->Get(visualType); + int visualType = -1; + if( valuePtr ) + { + valuePtr->Get( visualType ); + } if( animator.propertyKey == Toolkit::DevelVisual::Property::MIX_COLOR || animator.propertyKey == MIX_COLOR || @@ -514,7 +543,7 @@ void Visual::Base::AnimateProperty( } else if( mImpl->mRenderer ) { - AnimateRendererProperty(transition, animator); + AnimateRendererProperty( transition, animator ); } }