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
Set TapGesture only if there is an anchor.
[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
..
58a19a7
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h
+++ b/
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_BOUNCING_EFFECT_ACTOR_H
/*
#define DALI_TOOLKIT_INTERNAL_BOUNCING_EFFECT_ACTOR_H
/*
- * Copyright (c) 20
16
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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.
@@
-24,13
+24,10
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
/**
* @brief Creates a Dali::Actor to display the bouncing effect for overshoot
*
/**
* @brief Creates a Dali::Actor to display the bouncing effect for overshoot
*
@@
-41,7
+38,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
@@
-57,7
+54,7
@@
namespace Internal
* @param[out] bouncePropertyIndex The property index which controls the bouncing
* @return The actor which displays the bouncing effect
*/
* @param[out] bouncePropertyIndex The property index which controls the bouncing
* @return The actor which displays the bouncing effect
*/
-Actor CreateBouncingEffectActor(
Property::Index& bouncePropertyIndex);
+Actor CreateBouncingEffectActor(Property::Index& bouncePropertyIndex);
} // namespace Internal
} // namespace Internal
@@
-65,5
+62,4
@@
Actor CreateBouncingEffectActor( Property::Index& bouncePropertyIndex);
} // namespace Dali
} // namespace Dali
-
#endif // DALI_TOOLKIT_INTERNAL_BOUNCING_EFFECT_ACTOR_H
#endif // DALI_TOOLKIT_INTERNAL_BOUNCING_EFFECT_ACTOR_H