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
Make NPatchData receive LoadComplete call from TextureManager.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-factory-impl.h
diff --git
a/dali-toolkit/internal/visuals/visual-factory-impl.h
b/dali-toolkit/internal/visuals/visual-factory-impl.h
index
10df880
..
e4dd8d3
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-factory-impl.h
@@
-91,7
+91,7
@@
protected:
/**
* A reference counted object may only be deleted by calling Unreference()
*/
/**
* A reference counted object may only be deleted by calling Unreference()
*/
-
virtual ~VisualFactory()
;
+
~VisualFactory() override
;
private:
/**
private:
/**
@@
-132,12
+132,12
@@
void InitializeVisual( Actor& actor, Toolkit::Visual::Base& visual, ParameterTyp
{
if( actor )
{
{
if( actor )
{
- Toolkit::GetImplementation(visual).SetOffS
tag
e( actor );
+ Toolkit::GetImplementation(visual).SetOffS
cen
e( actor );
}
visual = Toolkit::VisualFactory::Get().CreateVisual( param0, param1 );
}
visual = Toolkit::VisualFactory::Get().CreateVisual( param0, param1 );
- if( visual && actor && actor.
OnStage(
) )
+ if( visual && actor && actor.
GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE
) )
{
{
- Toolkit::GetImplementation(visual).SetOnS
tag
e(actor);
+ Toolkit::GetImplementation(visual).SetOnS
cen
e(actor);
}
}
}
}
@@
-155,12
+155,12
@@
void InitializeVisual( Actor& actor, Toolkit::Visual::Base& visual, ParameterTyp
{
if( actor && visual )
{
{
if( actor && visual )
{
- Toolkit::GetImplementation(visual).SetOffS
tag
e( actor );
+ Toolkit::GetImplementation(visual).SetOffS
cen
e( actor );
}
visual = Toolkit::VisualFactory::Get().CreateVisual( param );
}
visual = Toolkit::VisualFactory::Get().CreateVisual( param );
- if( visual && actor && actor.
OnStage(
) )
+ if( visual && actor && actor.
GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE
) )
{
{
- Toolkit::GetImplementation(visual).SetOnS
tag
e(actor);
+ Toolkit::GetImplementation(visual).SetOnS
cen
e(actor);
}
}
}
}