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 dependency to std::vector and property::value from property notification API
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scroll-bar
/
scroll-bar-impl.cpp
diff --git
a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
index
b6e9e90
..
10b4820
100755
(executable)
--- a/
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@
-219,7
+219,7
@@
void ScrollBar::ApplyConstraints()
}
}
}
}
-void ScrollBar::SetPositionNotifications( const
std::v
ector<float>& positions )
+void ScrollBar::SetPositionNotifications( const
Dali::V
ector<float>& positions )
{
if(mScrollPositionObject)
{
{
if(mScrollPositionObject)
{
@@
-252,7
+252,7
@@
void ScrollBar::Show()
if(mIndicatorShowDuration > 0.0f)
{
mAnimation = Animation::New( mIndicatorShowDuration );
if(mIndicatorShowDuration > 0.0f)
{
mAnimation = Animation::New( mIndicatorShowDuration );
- mAnimation.AnimateTo( Property( self, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction
s::EaseIn
);
+ mAnimation.AnimateTo( Property( self, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction
::EASE_IN
);
mAnimation.Play();
}
else
mAnimation.Play();
}
else
@@
-275,7
+275,7
@@
void ScrollBar::Hide()
if(mIndicatorHideDuration > 0.0f)
{
mAnimation = Animation::New( mIndicatorHideDuration );
if(mIndicatorHideDuration > 0.0f)
{
mAnimation = Animation::New( mIndicatorHideDuration );
- mAnimation.AnimateTo( Property( self, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunction
s::EaseIn
);
+ mAnimation.AnimateTo( Property( self, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunction
::EASE_IN
);
mAnimation.Play();
}
else
mAnimation.Play();
}
else