X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fcolor%2Fcolor-visual.cpp;h=9ceed38a35d62773693805179deb233eeb45b104;hb=8c0b17fb124c735b31c441873da4d7ffc4b15eb5;hp=a1ef6d2ee3c8a7cda872cd6a883e643ada8a87c7;hpb=d6fead18ff8cc7fca3feb1aa1789e47583796814;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 a1ef6d2..9ceed38 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.cpp +++ b/dali-toolkit/internal/visuals/color/color-visual.cpp @@ -23,6 +23,7 @@ //INTERNAL INCLUDES #include +#include #include #include #include @@ -65,6 +66,11 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( ); } +ColorVisualPtr ColorVisual::New( VisualFactoryCache& factoryCache ) +{ + return new ColorVisual( factoryCache ); +} + ColorVisual::ColorVisual( VisualFactoryCache& factoryCache ) : Visual::Base( factoryCache ), mMixColorIndex( Property::INVALID_INDEX ) @@ -75,7 +81,7 @@ ColorVisual::~ColorVisual() { } -void ColorVisual::DoInitialize( Actor& actor, const Property::Map& propertyMap ) +void ColorVisual::DoSetProperties( const Property::Map& propertyMap ) { Property::Value* color = propertyMap.Find( Toolkit::ColorVisual::Property::MIX_COLOR, COLOR_NAME ); if( !( color && color->Get(mMixColor) ) ) @@ -101,7 +107,7 @@ void ColorVisual::DoSetOnStage( Actor& actor ) void ColorVisual::DoCreatePropertyMap( Property::Map& map ) const { map.Clear(); - map.Insert( Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR ); + map.Insert( Toolkit::VisualProperty::TYPE, Toolkit::Visual::COLOR ); map.Insert( Toolkit::ColorVisual::Property::MIX_COLOR, mMixColor ); }