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.h;h=939d40ec1280cf6d014d77b700f6c6018e04d624;hp=ebe2768d99235c4c4e673617a142f4a5e7ae8d3d;hb=190a30974e11c5792335e3b0493bf1c212beec6a;hpb=5e04f7584e88f851481db93078a22100bbf88015 diff --git a/dali-toolkit/internal/visuals/color/color-visual.h b/dali-toolkit/internal/visuals/color/color-visual.h index ebe2768..939d40e 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.h +++ b/dali-toolkit/internal/visuals/color/color-visual.h @@ -53,9 +53,10 @@ public: * @brief Create a new color visual. * * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object + * @param[in] properties A Property::Map containing settings for this visual * @return A smart-pointer to the newly allocated visual. */ - static ColorVisualPtr New( VisualFactoryCache& factoryCache ); + static ColorVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties ); public: // from Visual @@ -64,6 +65,11 @@ public: // from Visual */ virtual void DoCreatePropertyMap( Property::Map& map ) const; + /** + * @copydoc Visual::Base::CreateInstancePropertyMap + */ + virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + protected: /** @@ -93,14 +99,6 @@ protected: */ virtual void OnSetTransform(); -public: - - /** - * Set the color for rendering. - * @param[in] color The color to be rendered. - */ - void SetColor( const Vector4& color ); - private: /** * @brief Initialize the renderer with the geometry and shader from the cache, if not available, create and save to the cache for sharing. @@ -114,12 +112,6 @@ private: // Undefined ColorVisual& operator=( const ColorVisual& colorRenderer ); - -private: - - Vector4 mMixColor; - Property::Index mMixColorIndex; - }; } // namespace Internal