X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fcolor%2Fcolor-visual.cpp;h=dce52556d04158aec25f9da594a83902412220c4;hb=bfa5276cfac80f6dd1f874503e6fefb74a90b19e;hp=74ad4d2427d87e9057bff0aa5afeb35a47b52108;hpb=07e964a770306dbd565c3c82e03b2f3a906163c4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/color/color-visual.cpp b/dali-toolkit/internal/visuals/color/color-visual.cpp index 74ad4d2..dce5255 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.cpp +++ b/dali-toolkit/internal/visuals/color/color-visual.cpp @@ -20,12 +20,12 @@ // EXTERNAL INCLUDES #include -#include //INTERNAL INCLUDES #include #include #include +#include #include #include #include @@ -244,7 +244,7 @@ void ColorVisual::DoSetProperties( const Property::Map& propertyMap ) } } -void ColorVisual::DoSetOnStage( Actor& actor ) +void ColorVisual::DoSetOnScene( Actor& actor ) { InitializeRenderer(); @@ -282,6 +282,23 @@ void ColorVisual::OnSetTransform() } } +void ColorVisual::OnDoAction( const Property::Index actionId, const Property::Value& attributes ) +{ + // Check if action is valid for this visual type and perform action if possible + switch( actionId ) + { + case DevelColorVisual::Action::UPDATE_PROPERTY: + { + Property::Map* map = attributes.GetMap(); + if( map ) + { + DoSetProperties( *map ); + } + break; + } + } +} + void ColorVisual::InitializeRenderer() { Geometry geometry = mFactoryCache.GetGeometry( VisualFactoryCache::QUAD_GEOMETRY ); @@ -320,7 +337,7 @@ void ColorVisual::InitializeRenderer() // ColorVisual has it's own index key for mix color - use this instead // of using the new base index to avoid changing existing applications // String keys will get to this property. - mImpl->mMixColorIndex = DevelHandle::RegisterProperty( mImpl->mRenderer, Toolkit::ColorVisual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor) ); + mImpl->mMixColorIndex = mImpl->mRenderer.RegisterProperty( Toolkit::ColorVisual::Property::MIX_COLOR, MIX_COLOR, Vector3(mImpl->mMixColor) ); mImpl->mRenderer.RegisterProperty( BLUR_RADIUS_NAME, mBlurRadius );