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 "Added BACKGROUND_BORDER property to TextSelectionPopup" into devel/master
[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
790a3e7
..
6a19c9b
100644
(file)
--- a/
dali-toolkit/devel-api/visual-factory/visual-base.cpp
+++ b/
dali-toolkit/devel-api/visual-factory/visual-base.cpp
@@
-66,11
+66,16
@@
void Visual::Base::SetTransformAndSize( const Property::Map& transform, Size con
GetImplementation( *this ).SetTransformAndSize( transform, controlSize );
}
GetImplementation( *this ).SetTransformAndSize( transform, controlSize );
}
-float Visual::Base::GetHeightForWidth( float width )
const
+float Visual::Base::GetHeightForWidth( float width )
{
return GetImplementation( *this ).GetHeightForWidth( width );
}
{
return GetImplementation( *this ).GetHeightForWidth( width );
}
+float Visual::Base::GetWidthForHeight( float height )
+{
+ return GetImplementation( *this ).GetWidthForHeight( height );
+}
+
void Visual::Base::GetNaturalSize(Vector2& naturalSize )
{
GetImplementation( *this ).GetNaturalSize( naturalSize );
void Visual::Base::GetNaturalSize(Vector2& naturalSize )
{
GetImplementation( *this ).GetNaturalSize( naturalSize );
@@
-91,15
+96,8
@@
void Visual::Base::CreatePropertyMap( Property::Map& map ) const
GetImplementation( *this ).CreatePropertyMap( map );
}
GetImplementation( *this ).CreatePropertyMap( map );
}
-void Visual::Base::SetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue )
-{
- GetImplementation( *this ).SetProperty( index, propertyValue );
-}
-Dali::Property::Value Visual::Base::GetProperty( Dali::Property::Index index )
-{
- return GetImplementation( *this ).GetProperty( index );
-}
+
} // namespace Toolkit
} // namespace Toolkit