projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "DALi C# binding - Write pure C# Color & Position classes and use typemaps...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
svg
/
svg-visual.h
diff --git
a/dali-toolkit/internal/visuals/svg/svg-visual.h
b/dali-toolkit/internal/visuals/svg/svg-visual.h
index
7beb6d6
..
43ac1f4
100644
(file)
--- a/
dali-toolkit/internal/visuals/svg/svg-visual.h
+++ b/
dali-toolkit/internal/visuals/svg/svg-visual.h
@@
-61,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] 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
*/
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
/**
* @copydoc Visual::Base::CreatePropertyMap
@@
-121,6
+115,11
@@
protected:
*/
virtual void DoSetOffStage( Actor& actor );
*/
virtual void DoSetOffStage( Actor& actor );
+ /**
+ * @copydoc Visual::Base::OnSetTransform
+ */
+ virtual void OnSetTransform();
+
public:
/**
public:
/**
@@
-136,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.
* @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.
/**
* @bried Rasterize the svg with the given size, and add it to the visual.
@@
-159,7
+157,7
@@
private:
std::string mImageUrl;
NSVGimage* mParsedImage;
WeakHandle<Actor> mPlacementActor;
std::string mImageUrl;
NSVGimage* mParsedImage;
WeakHandle<Actor> mPlacementActor;
-
+ Vector2 mVisualSize;
};
} // namespace Internal
};
} // namespace Internal