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 "Note that some Text propeties in devel api can't be changed" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-impl.cpp
diff --git
a/dali-toolkit/internal/visuals/visual-base-impl.cpp
b/dali-toolkit/internal/visuals/visual-base-impl.cpp
index
d483ef5
..
7add024
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.cpp
@@
-221,7
+221,7
@@
void Visual::Base::GetNaturalSize( Vector2& naturalSize )
naturalSize = Vector2::ZERO;
}
naturalSize = Vector2::ZERO;
}
-void Visual::Base::SetDepthIndex(
floa
t index )
+void Visual::Base::SetDepthIndex(
in
t index )
{
mImpl->mDepthIndex = index;
if( mImpl->mRenderer )
{
mImpl->mDepthIndex = index;
if( mImpl->mRenderer )
@@
-230,7
+230,7
@@
void Visual::Base::SetDepthIndex( float index )
}
}
}
}
-
floa
t Visual::Base::GetDepthIndex() const
+
in
t Visual::Base::GetDepthIndex() const
{
return mImpl->mDepthIndex;
}
{
return mImpl->mDepthIndex;
}