projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove RenderableActor
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
actors
/
image-actor-impl.cpp
diff --git
a/dali/internal/event/actors/image-actor-impl.cpp
b/dali/internal/event/actors/image-actor-impl.cpp
index
f81952b
..
5c6b028
100644
(file)
--- a/
dali/internal/event/actors/image-actor-impl.cpp
+++ b/
dali/internal/event/actors/image-actor-impl.cpp
@@
-53,7
+53,7
@@
BaseHandle Create()
return Dali::ImageActor::New();
}
return Dali::ImageActor::New();
}
-TypeRegistration mType( typeid( Dali::ImageActor ), typeid( Dali::
Renderable
Actor ), Create );
+TypeRegistration mType( typeid( Dali::ImageActor ), typeid( Dali::Actor ), Create );
ImageActor::Style StyleEnum(const std::string &s)
{
ImageActor::Style StyleEnum(const std::string &s)
{
@@
-197,7
+197,7
@@
RenderableAttachment& ImageActor::GetRenderableAttachment() const
}
ImageActor::ImageActor()
}
ImageActor::ImageActor()
-:
RenderableActor(
)
+:
Actor( Actor::RENDERABLE
)
{
}
{
}
@@
-244,12
+244,12
@@
void ImageActor::OnStageDisconnectionInternal()
unsigned int ImageActor::GetDefaultPropertyCount() const
{
unsigned int ImageActor::GetDefaultPropertyCount() const
{
- return
Renderable
Actor::GetDefaultPropertyCount() + DEFAULT_PROPERTY_COUNT;
+ return Actor::GetDefaultPropertyCount() + DEFAULT_PROPERTY_COUNT;
}
void ImageActor::GetDefaultPropertyIndices( Property::IndexContainer& indices ) const
{
}
void ImageActor::GetDefaultPropertyIndices( Property::IndexContainer& indices ) const
{
-
RenderableActor::GetDefaultPropertyIndices( indices ); // Renderable
Actor class properties
+
Actor::GetDefaultPropertyIndices( indices ); //
Actor class properties
indices.Reserve( indices.Size() + DEFAULT_PROPERTY_COUNT );
indices.Reserve( indices.Size() + DEFAULT_PROPERTY_COUNT );
@@
-264,7
+264,7
@@
bool ImageActor::IsDefaultPropertyWritable( Property::Index index ) const
{
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
{
{
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
{
- return
Renderable
Actor::IsDefaultPropertyWritable(index);
+ return Actor::IsDefaultPropertyWritable(index);
}
index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
}
index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
@@
-280,7
+280,7
@@
bool ImageActor::IsDefaultPropertyAnimatable( Property::Index index ) const
{
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
{
{
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
{
- return
Renderable
Actor::IsDefaultPropertyAnimatable( index );
+ return Actor::IsDefaultPropertyAnimatable( index );
}
index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
}
index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
@@
-296,7
+296,7
@@
bool ImageActor::IsDefaultPropertyAConstraintInput( Property::Index index ) cons
{
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
{
{
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
{
- return
Renderable
Actor::IsDefaultPropertyAConstraintInput( index );
+ return Actor::IsDefaultPropertyAConstraintInput( index );
}
index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
}
index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
@@
-312,7
+312,7
@@
Property::Type ImageActor::GetDefaultPropertyType( Property::Index index ) const
{
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
{
{
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
{
- return
Renderable
Actor::GetDefaultPropertyType( index );
+ return Actor::GetDefaultPropertyType( index );
}
index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
}
index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
@@
-329,7
+329,7
@@
const char* ImageActor::GetDefaultPropertyName( Property::Index index ) const
{
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT)
{
{
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT)
{
- return
Renderable
Actor::GetDefaultPropertyName(index);
+ return Actor::GetDefaultPropertyName(index);
}
index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
}
index -= DEFAULT_DERIVED_ACTOR_PROPERTY_START_INDEX;
@@
-360,7
+360,7
@@
Property::Index ImageActor::GetDefaultPropertyIndex(const std::string& name) con
// If not found, check in base class
if( Property::INVALID_INDEX == index )
{
// If not found, check in base class
if( Property::INVALID_INDEX == index )
{
- index =
Renderable
Actor::GetDefaultPropertyIndex( name );
+ index = Actor::GetDefaultPropertyIndex( name );
}
return index;
}
}
return index;
}
@@
-369,7
+369,7
@@
void ImageActor::SetDefaultProperty( Property::Index index, const Property::Valu
{
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
{
{
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
{
-
Renderable
Actor::SetDefaultProperty( index, propertyValue );
+ Actor::SetDefaultProperty( index, propertyValue );
}
else
{
}
else
{
@@
-419,7
+419,7
@@
Property::Value ImageActor::GetDefaultProperty( Property::Index index ) const
Property::Value ret;
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
{
Property::Value ret;
if( index < DEFAULT_ACTOR_PROPERTY_MAX_COUNT )
{
- ret =
Renderable
Actor::GetDefaultProperty( index );
+ ret = Actor::GetDefaultProperty( index );
}
else
{
}
else
{