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 "Merge branch 'devel/master(1.2.18)' into tizen" into tizen
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
visual-factory
/
visual-base.cpp
diff --git
a/dali-toolkit/devel-api/visual-factory/visual-base.cpp
b/dali-toolkit/devel-api/visual-factory/visual-base.cpp
index
0b3193f
..
4454e98
100644
(file)
--- a/
dali-toolkit/devel-api/visual-factory/visual-base.cpp
+++ b/
dali-toolkit/devel-api/visual-factory/visual-base.cpp
@@
-27,84
+27,70
@@
namespace Dali
namespace Toolkit
{
namespace Toolkit
{
-namespace Visual
-{
-
-Base::Base()
+Visual::Base::Base()
{
}
{
}
-Base::~Base()
+
Visual::
Base::~Base()
{
}
{
}
-
Base::Base( const
Base& handle )
+
Visual::Base::Base( const Visual::
Base& handle )
: BaseHandle( handle )
{
}
: BaseHandle( handle )
{
}
-
Base& Base::operator=( const
Base& handle )
+
Visual::Base& Visual::Base::operator=( const Visual::
Base& handle )
{
BaseHandle::operator=( handle );
return *this;
}
{
BaseHandle::operator=( handle );
return *this;
}
-Base::Base(Internal::Visual::Base *impl)
+
Visual::
Base::Base(Internal::Visual::Base *impl)
: BaseHandle( impl )
{
}
: BaseHandle( impl )
{
}
-void Base::SetSize( const Vector2& size )
-{
- GetImplementation( *this ).SetSize( size );
-}
-
-const Vector2& Base::GetSize() const
+void Visual::Base::SetName( const std::string& name )
{
{
-
return GetImplementation( *this ).GetSize(
);
+
GetImplementation( *this ).SetName( name
);
}
}
-void Base::GetNaturalSize(Vector2& naturalSize ) const
+const std::string& Visual::Base::GetName()
{
{
-
GetImplementation( *this ).GetNaturalSize( naturalSize
);
+
return GetImplementation( *this ).GetName(
);
}
}
-void
Base::SetDepthIndex( float index
)
+void
Visual::Base::SetTransformAndSize( const Property::Map& transform, Size controlSize
)
{
{
- GetImplementation( *this ).Set
DepthIndex( index
);
+ GetImplementation( *this ).Set
TransformAndSize( transform, controlSize
);
}
}
-float
Base::GetDepthIndex(
) const
+float
Visual::Base::GetHeightForWidth( float width
) const
{
{
- return GetImplementation( *this ).Get
DepthIndex(
);
+ return GetImplementation( *this ).Get
HeightForWidth( width
);
}
}
-void
Base::SetOnStage( Actor& actor
)
+void
Visual::Base::GetNaturalSize(Vector2& naturalSize
)
{
{
- GetImplementation( *this ).
SetOnStage( actor
);
+ GetImplementation( *this ).
GetNaturalSize( naturalSize
);
}
}
-void
Base::SetOffStage( Actor& actor
)
+void
Visual::Base::SetDepthIndex( float index
)
{
{
- GetImplementation( *this ).Set
OffStage( actor
);
+ GetImplementation( *this ).Set
DepthIndex( index
);
}
}
-void Base::RemoveAndReset( Actor& actor )
+float Visual::Base::GetDepthIndex() const
{
{
- if( actor && *this )
- {
- SetOffStage( actor );
- }
- Reset();
+ return GetImplementation( *this ).GetDepthIndex();
}
}
-void Base::CreatePropertyMap( Property::Map& map ) const
+void
Visual::
Base::CreatePropertyMap( Property::Map& map ) const
{
GetImplementation( *this ).CreatePropertyMap( map );
}
{
GetImplementation( *this ).CreatePropertyMap( map );
}
-} // namespace Visual
-
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali