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
Cleanup of Visual::Base::SetSize
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-data-impl.cpp
diff --git
a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
index
1826196
..
158c432
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-data-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-base-data-impl.cpp
@@
-82,8
+82,9
@@
Dali::Vector2 PointToVector2( Toolkit::Align::Type point, Toolkit::Direction::Ty
} // unnamed namespace
Internal::Visual::Base::Impl::Impl()
} // unnamed namespace
Internal::Visual::Base::Impl::Impl()
-: mCustomShader(
NULL
),
+: mCustomShader(
NULL
),
mTransform(),
mTransform(),
+ mControlSize( Vector2::ZERO ),
mDepthIndex( 0.0f ),
mFlags( 0 )
{
mDepthIndex( 0.0f ),
mFlags( 0 )
{
@@
-267,6
+268,13
@@
void Internal::Visual::Base::Impl::Transform::RegisterUniforms( Dali::Renderer r
renderer.RegisterProperty( ANCHOR_POINT, Vector2(0.5,0.5) - PointToVector2( mAnchorPoint, direction ) );
}
renderer.RegisterProperty( ANCHOR_POINT, Vector2(0.5,0.5) - PointToVector2( mAnchorPoint, direction ) );
}
+Vector2 Internal::Visual::Base::Impl::Transform::GetVisualSize( const Vector2& controlSize )
+{
+ return Vector2( Lerp( mOffsetSizeMode.x, mSize.x * controlSize.x, mSize.x ),
+ Lerp( mOffsetSizeMode.y, mSize.y * controlSize.y, mSize.y ) );
+}
+
+
} // namespace Internal
} // namespace Toolkit
} // namespace Internal
} // namespace Toolkit