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 Control's own PanGestureDetector in ScrollBar" 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
1ef1e47
..
350ace5
100755
(executable)
--- a/
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@
-175,7
+175,7
@@
ScrollBar::~ScrollBar()
void ScrollBar::OnInitialize()
{
CreateDefaultIndicatorActor();
void ScrollBar::OnInitialize()
{
CreateDefaultIndicatorActor();
- Self().SetDrawMode(DrawMode::OVERLAY);
+ Self().SetDrawMode(DrawMode::OVERLAY
_2D
);
}
void ScrollBar::SetScrollPropertySource( Handle handle, Property::Index propertyScrollPosition, Property::Index propertyMinScrollPosition, Property::Index propertyMaxScrollPosition, Property::Index propertyScrollContentSize )
}
void ScrollBar::SetScrollPropertySource( Handle handle, Property::Index propertyScrollPosition, Property::Index propertyMinScrollPosition, Property::Index propertyMaxScrollPosition, Property::Index propertyScrollContentSize )
@@
-220,14
+220,11
@@
void ScrollBar::SetScrollIndicator( Actor indicator )
mIndicator = indicator;
Self().Add(mIndicator);
mIndicator = indicator;
Self().Add(mIndicator);
- if( !mPanGestureDetector )
- {
- mPanGestureDetector = PanGestureDetector::New();
- mPanGestureDetector.DetectedSignal().Connect(this, &ScrollBar::OnPan);
- }
+ EnableGestureDetection(Gesture::Type(Gesture::Pan));
- mPanGestureDetector.DetachAll();
- mPanGestureDetector.Attach( mIndicator );
+ PanGestureDetector detector( GetPanGestureDetector() );
+ detector.DetachAll();
+ detector.Attach( mIndicator );
unsigned int childCount = mIndicator.GetChildCount();
for ( unsigned int index = 0; index < childCount; index++ )
unsigned int childCount = mIndicator.GetChildCount();
for ( unsigned int index = 0; index < childCount; index++ )
@@
-235,7
+232,7
@@
void ScrollBar::SetScrollIndicator( Actor indicator )
Actor child = mIndicator.GetChildAt( index );
if ( child )
{
Actor child = mIndicator.GetChildAt( index );
if ( child )
{
-
mPanGestureD
etector.Attach( child );
+
d
etector.Attach( child );
}
}
}
}
}
}
@@
-370,7
+367,7
@@
bool ScrollBar::OnPanGestureProcessTick()
return true;
}
return true;
}
-void ScrollBar::OnPan(
Actor source,
const PanGesture& gesture )
+void ScrollBar::OnPan( const PanGesture& gesture )
{
if(mScrollableObject)
{
{
if(mScrollableObject)
{