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 "Fixed patch-coverage generation" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
svg
/
svg-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/svg/svg-visual.cpp
b/dali-toolkit/internal/visuals/svg/svg-visual.cpp
index
a1da87f
..
ef2fdae
100644
(file)
--- a/
dali-toolkit/internal/visuals/svg/svg-visual.cpp
+++ b/
dali-toolkit/internal/visuals/svg/svg-visual.cpp
@@
-110,6
+110,9
@@
void SvgVisual::DoSetOnStage( Actor& actor )
// Hold the weak handle of the placement actor and delay the adding of renderer until the svg rasterization is finished.
mPlacementActor = actor;
// Hold the weak handle of the placement actor and delay the adding of renderer until the svg rasterization is finished.
mPlacementActor = actor;
+
+ // SVG visual needs it's size set before it can be rasterized hence set ResourceReady once on stage
+ ResourceReady();
}
void SvgVisual::DoSetOffStage( Actor& actor )
}
void SvgVisual::DoSetOffStage( Actor& actor )
@@
-152,7
+155,7
@@
void SvgVisual::DoCreateInstancePropertyMap( Property::Map& map ) const
void SvgVisual::ParseFromUrl( const VisualUrl& imageUrl )
{
mImageUrl = imageUrl;
void SvgVisual::ParseFromUrl( const VisualUrl& imageUrl )
{
mImageUrl = imageUrl;
- if( mImageUrl.IsLocal() )
+ if( mImageUrl.IsLocal
Resource
() )
{
Vector2 dpi = Stage::GetCurrent().GetDpi();
float meanDpi = (dpi.height + dpi.width) * 0.5f;
{
Vector2 dpi = Stage::GetCurrent().GetDpi();
float meanDpi = (dpi.height + dpi.width) * 0.5f;