X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fsvg%2Fsvg-visual.h;h=0d5dcf8125c4ce9077516c2f222bbeb5d29879a9;hp=26e72084b2b4558656a0c8ebd9a8acd9279984bb;hb=8cfc7965881ba756bca7bdde98b548200a649bd4;hpb=caf7677175a0e8b9c690d4f2ab73adc295f22c0e diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h index 26e7208..0d5dcf8 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.h +++ b/dali-toolkit/internal/visuals/svg/svg-visual.h @@ -24,6 +24,7 @@ // INTERNAL INCLUDES #include +#include struct NSVGimage; @@ -64,7 +65,7 @@ public: * @param[in] properties A Property::Map containing settings for this visual * @return A smart-pointer to the newly allocated visual. */ - static SvgVisualPtr New( VisualFactoryCache& factoryCache, const std::string& imageUrl, const Property::Map& properties ); + static SvgVisualPtr New( VisualFactoryCache& factoryCache, const VisualUrl& imageUrl, const Property::Map& properties ); /** * @brief Create the SVG Visual using the image URL. @@ -76,7 +77,7 @@ public: * @param[in] imageUrl The URL to svg resource to use * @return A smart-pointer to the newly allocated visual. */ - static SvgVisualPtr New( VisualFactoryCache& factoryCache, const std::string& imageUrl ); + static SvgVisualPtr New( VisualFactoryCache& factoryCache, const VisualUrl& imageUrl ); public: // from Visual @@ -90,6 +91,11 @@ public: // from Visual */ virtual void DoCreatePropertyMap( Property::Map& map ) const; + /** + * @copydoc Visual::Base::CreateInstancePropertyMap + */ + virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + protected: /** @@ -140,7 +146,7 @@ private: * * @param[in] imageUrl The URL of the image to parse the SVG from. */ - void ParseFromUrl( const std::string& imageUrl ); + void ParseFromUrl( const VisualUrl& imageUrl ); /** * @bried Rasterize the svg with the given size, and add it to the visual. @@ -158,7 +164,7 @@ private: private: Vector4 mAtlasRect; - std::string mImageUrl; + VisualUrl mImageUrl; NSVGimage* mParsedImage; WeakHandle mPlacementActor; Vector2 mVisualSize;