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 "propagate unhandled key( DALI_KEY_SEARCH )" 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
..
b6a51fb
100644
(file)
--- a/
dali-toolkit/devel-api/visual-factory/visual-base.cpp
+++ b/
dali-toolkit/devel-api/visual-factory/visual-base.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-66,22
+66,27
@@
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 );
}
-void Visual::Base::SetDepthIndex(
floa
t index )
+void Visual::Base::SetDepthIndex(
in
t index )
{
GetImplementation( *this ).SetDepthIndex( index );
}
{
GetImplementation( *this ).SetDepthIndex( index );
}
-
floa
t Visual::Base::GetDepthIndex() const
+
in
t Visual::Base::GetDepthIndex() const
{
return GetImplementation( *this ).GetDepthIndex();
}
{
return GetImplementation( *this ).GetDepthIndex();
}
@@
-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