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
Remove non-public APIs of Animation
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
buttons
/
push-button-impl.cpp
diff --git
a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp
index
c96d56d
..
b172a18
100644
(file)
--- a/
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
+++ b/
dali-toolkit/internal/controls/buttons/push-button-impl.cpp
@@
-1104,14
+1104,14
@@
Actor& PushButton::GetFadeOutBackgroundImage()
return mFadeOutBackgroundContent;
}
return mFadeOutBackgroundContent;
}
-void PushButton::AddToFadeInAnimation(
const
Actor& actor )
+void PushButton::AddToFadeInAnimation( Actor& actor )
{
if( !mFadeInAnimation )
{
mFadeInAnimation = Dali::Animation::New( GetAnimationTime() );
}
{
if( !mFadeInAnimation )
{
mFadeInAnimation = Dali::Animation::New( GetAnimationTime() );
}
- mFadeInAnimation.
OpacityTo( actor
, 1.f );
+ mFadeInAnimation.
AnimateTo( Property( actor, Actor::Property::COLOR_ALPHA )
, 1.f );
}
void PushButton::StartFadeInAnimation()
}
void PushButton::StartFadeInAnimation()
@@
-1132,14
+1132,14
@@
void PushButton::StopFadeInAnimation()
}
}
}
}
-void PushButton::AddToFadeOutAnimation(
const
Actor& actor )
+void PushButton::AddToFadeOutAnimation( Actor& actor )
{
if( !mFadeOutAnimation )
{
mFadeOutAnimation = Dali::Animation::New( GetAnimationTime() );
}
{
if( !mFadeOutAnimation )
{
mFadeOutAnimation = Dali::Animation::New( GetAnimationTime() );
}
- mFadeOutAnimation.
OpacityTo( actor
, 0.f );
+ mFadeOutAnimation.
AnimateTo( Property( actor, Actor::Property::COLOR_ALPHA )
, 0.f );
}
void PushButton::StartFadeOutAnimation()
}
void PushButton::StartFadeOutAnimation()