X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fvisuals%2Fsvg%2Fsvg-visual.h;h=43ac1f43e6f796a97c529032e0d29b8fd96dd006;hb=refs%2Fchanges%2F32%2F98732%2F1;hp=5dbd24e645f3a3606f02e971c0fe813d653bf52c;hpb=3e6769f502e8ce54a9ddd4579707438bb5827a62;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h index 5dbd24e..43ac1f4 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.h +++ b/dali-toolkit/internal/visuals/svg/svg-visual.h @@ -54,14 +54,6 @@ class SvgVisual: public Visual::Base public: /** - * @brief Create a new SVG visual. - * - * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object - * @return A smart-pointer to the newly allocated visual. - */ - static SvgVisualPtr New( VisualFactoryCache& factoryCache ); - - /** * @brief Create the SVG Visual using the image URL. * * The visual will parse the SVG image once it is set. @@ -69,21 +61,15 @@ public: * * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object * @param[in] imageUrl The URL to svg resource to use - * @param[in] size The required size for the SVG */ - static SvgVisualPtr New( VisualFactoryCache& factoryCache, const std::string& imageUrl, ImageDimensions size = ImageDimensions() ); + static SvgVisualPtr New( VisualFactoryCache& factoryCache, const std::string& imageUrl ); public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ) const; - - /** - * @copydoc Visual::Base::SetSize - */ - virtual void SetSize( const Vector2& size ); + virtual void GetNaturalSize( Vector2& naturalSize ); /** * @copydoc Visual::Base::CreatePropertyMap @@ -115,9 +101,9 @@ protected: virtual ~SvgVisual(); /** - * @copydoc Visual::Base::DoInitialize + * @copydoc Visual::Base::DoSetProperties */ - virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ); + virtual void DoSetProperties( const Property::Map& propertyMap ); /** * @copydoc Visual::Base::DoSetOnStage @@ -129,6 +115,11 @@ protected: */ virtual void DoSetOffStage( Actor& actor ); + /** + * @copydoc Visual::Base::OnSetTransform + */ + virtual void OnSetTransform(); + public: /** @@ -144,9 +135,8 @@ private: * @brief Parses the SVG Image from the set URL. * * @param[in] imageUrl The URL of the image to parse the SVG from. - * @param[in] size The required size of the SVG */ - void ParseFromUrl( const std::string& imageUrl, ImageDimensions size = ImageDimensions() ); + void ParseFromUrl( const std::string& imageUrl ); /** * @bried Rasterize the svg with the given size, and add it to the visual. @@ -167,7 +157,7 @@ private: std::string mImageUrl; NSVGimage* mParsedImage; WeakHandle mPlacementActor; - + Vector2 mVisualSize; }; } // namespace Internal