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 current ScrollBar indicator when setting new customed indicator
[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
97e2680
..
a34e7bd
100755
(executable)
--- a/
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/
dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@
-243,11
+243,16
@@
void ScrollBar::SetScrollIndicator( Actor indicator )
// Don't allow empty handle
if( indicator )
{
// Don't allow empty handle
if( indicator )
{
+ // Remove current Indicator
+ if( mIndicator )
+ {
+ Self().Remove( mIndicator );
+ }
mIndicator = indicator;
mIndicatorFirstShow = true;
mIndicator = indicator;
mIndicatorFirstShow = true;
- Self().Add(
mIndicator
);
+ Self().Add(
mIndicator
);
- EnableGestureDetection(
Gesture::Type(Gesture::Pan)
);
+ EnableGestureDetection(
Gesture::Type( Gesture::Pan )
);
PanGestureDetector detector( GetPanGestureDetector() );
detector.DetachAll();
PanGestureDetector detector( GetPanGestureDetector() );
detector.DetachAll();