X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fbouncing-effect-actor.h;h=5e33a832a99ce97f3c020935542cc1603e2d86b2;hp=b374df5f0e6ccb8d8a2af48ae6f7e3a8abe61c9e;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=306d2f61a1b64179e801fa8a0bb2bd7b4e9dd682 diff --git a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h index b374df5..5e33a83 100644 --- a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h +++ b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_BOUNCING_EFFECT_ACTOR_H__ -#define __DALI_TOOLKIT_INTERNAL_BOUNCING_EFFECT_ACTOR_H__ +#ifndef DALI_TOOLKIT_INTERNAL_BOUNCING_EFFECT_ACTOR_H +#define DALI_TOOLKIT_INTERNAL_BOUNCING_EFFECT_ACTOR_H /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -18,7 +18,7 @@ * */ -// INTERNAL INCLUDES +// EXTERNAL INCLUDES #include #include @@ -41,16 +41,16 @@ namespace Internal * Actor bounceActor = CreateBouncingEffectActor( bouncePropertyIndex ); * // set size and color - * bounceActor.SetSize(720.f, 42.f ); - * bounceActor.SetColor( Vector4( 0.0,0.64f,0.85f,0.25f ) ); + * bounceActor.SetProperty( 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.SetParentOrigin(ParentOrigin::CENTER); + * bounceActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); * Stage::GetCurrent().Add(bounceActor); * // start the bouncing animation * Animation anim = Animation::New(2.0f); - * anim.AnimateTo( Property( bounceActor, bouncePropertyIndex ), 1.f, AlphaFunctions::Sin ); + * anim.AnimateTo( Property( bounceActor, bouncePropertyIndex ), 1.f, AlphaFunction::SIN ); * anim.Play(); * @endcode * @@ -66,4 +66,4 @@ Actor CreateBouncingEffectActor( Property::Index& bouncePropertyIndex); } // namespace Dali -#endif /* __DALI_TOOLKIT_INTERNAL_BOUNCING_EFFECT_ACTOR_H__ */ +#endif // DALI_TOOLKIT_INTERNAL_BOUNCING_EFFECT_ACTOR_H