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 "use string_view to avoid temporary string allocation." into devel/master
[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
c588487
..
54dc431
100644
(file)
--- a/
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@
-265,7
+265,7
@@
void ScrollBar::SetScrollIndicator( Actor indicator )
mIndicatorFirstShow = true;
Self().Add( mIndicator );
mIndicatorFirstShow = true;
Self().Add( mIndicator );
- EnableGestureDetection( Gesture
::Type( Gesture::Pan
) );
+ EnableGestureDetection( Gesture
Type::Value( GestureType::PAN
) );
PanGestureDetector detector( GetPanGestureDetector() );
detector.DetachAll();
PanGestureDetector detector( GetPanGestureDetector() );
detector.DetachAll();
@@
-461,7
+461,7
@@
void ScrollBar::OnPan( const PanGesture& gesture )
switch(gesture.GetState())
{
switch(gesture.GetState())
{
- case Dali::Gesture
::Started
:
+ case Dali::Gesture
State::STARTED
:
{
if( !mPanProcessTimer )
{
{
if( !mPanProcessTimer )
{
@@
-478,7
+478,7
@@
void ScrollBar::OnPan( const PanGesture& gesture )
break;
}
break;
}
- case Dali::Gesture
::Continuing
:
+ case Dali::Gesture
State::CONTINUING
:
{
mGestureDisplacement += gesture.GetDisplacement();
{
mGestureDisplacement += gesture.GetDisplacement();
@@
-689,7
+689,7
@@
void ScrollBar::SetProperty( BaseObject* object, Property::Index index, const Pr
}
case Toolkit::ScrollBar::Property::SCROLL_POSITION_INTERVALS:
{
}
case Toolkit::ScrollBar::Property::SCROLL_POSITION_INTERVALS:
{
- Property::Array* array = value.GetArray();
+
const
Property::Array* array = value.GetArray();
if( array )
{
Dali::Vector<float> positions;
if( array )
{
Dali::Vector<float> positions;