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 changes I17acf67f,If2410a4d into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
bouncing-effect-actor.h
diff --git
a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h
b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h
index
f78ab9f
..
5e33a83
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h
+++ b/
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h
@@
-41,7
+41,7
@@
namespace Internal
* Actor bounceActor = CreateBouncingEffectActor( bouncePropertyIndex );
* // set size and color
* Actor bounceActor = CreateBouncingEffectActor( bouncePropertyIndex );
* // set size and color
- * bounceActor.Set
Size
(720.f, 42.f );
+ * bounceActor.Set
Property( Actor::Property::SIZE, Vector2
(720.f, 42.f );
* bounceActor.SetProperty( Actor::Property::COLOR, Vector4( 0.0,0.64f,0.85f,0.25f ) );
*
* // add to stage
* bounceActor.SetProperty( Actor::Property::COLOR, Vector4( 0.0,0.64f,0.85f,0.25f ) );
*
* // add to stage