X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fcolor%2Fcolor-visual.cpp;h=2058e1b9da68ed98b2a3c07ee870099fcfc7f411;hp=2d8008f97687eeea23ceec67cc5f7f95445b3103;hb=f20180dbb4cd52afb0305f2aa7889e81f55ef19e;hpb=e9e5fdaaf29bbb7204e4c2ebd5be48f541c0114d diff --git a/dali-toolkit/internal/visuals/color/color-visual.cpp b/dali-toolkit/internal/visuals/color/color-visual.cpp index 2d8008f..2058e1b 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.cpp +++ b/dali-toolkit/internal/visuals/color/color-visual.cpp @@ -25,6 +25,7 @@ //INTERNAL INCLUDES #include #include +#include #include #include #include @@ -88,7 +89,8 @@ ColorVisualPtr ColorVisual::New( VisualFactoryCache& factoryCache, const Propert } ColorVisual::ColorVisual( VisualFactoryCache& factoryCache ) -: Visual::Base( factoryCache ) +: Visual::Base( factoryCache ), + mRenderIfTransparent( false ) { } @@ -122,13 +124,27 @@ void ColorVisual::DoSetProperties( const Property::Map& propertyMap ) DALI_LOG_ERROR("ColorVisual: mixColor property has incorrect type\n"); } } + + Property::Value* renderIfTransparentValue = propertyMap.Find( Toolkit::DevelColorVisual::Property::RENDER_IF_TRANSPARENT, RENDER_IF_TRANSPARENT_NAME ); + if( renderIfTransparentValue ) + { + if( ! renderIfTransparentValue->Get( mRenderIfTransparent ) ) + { + DALI_LOG_ERROR( "ColorVisual: renderIfTransparent property has incorrect type: %d\n", renderIfTransparentValue->GetType() ); + } + } } void ColorVisual::DoSetOnStage( Actor& actor ) { InitializeRenderer(); - actor.AddRenderer( mImpl->mRenderer ); + // Only add the renderer if it's not fully transparent + // We cannot avoid creating a renderer as it's used in the base class + if( mRenderIfTransparent || mImpl->mMixColor.a > 0.0f ) + { + actor.AddRenderer( mImpl->mRenderer ); + } // Color Visual generated and ready to display ResourceReady( Toolkit::Visual::ResourceStatus::READY ); @@ -139,6 +155,7 @@ void ColorVisual::DoCreatePropertyMap( Property::Map& map ) const map.Clear(); map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR ); map.Insert( Toolkit::ColorVisual::Property::MIX_COLOR, mImpl->mMixColor ); + map.Insert( Toolkit::DevelColorVisual::Property::RENDER_IF_TRANSPARENT, mRenderIfTransparent ); } void ColorVisual::DoCreateInstancePropertyMap( Property::Map& map ) const