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 "Fix VD prevent issues" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
scroll-view
/
scroll-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
index
a9714d4
..
a8bd61e
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
@@
-657,7
+657,7
@@
void ScrollView::OnInitialize()
SetInternalConstraints();
}
SetInternalConstraints();
}
-void ScrollView::OnStageConnection(
unsigned
int depth )
+void ScrollView::OnStageConnection( int depth )
{
DALI_LOG_SCROLL_STATE("[0x%X]", this);
{
DALI_LOG_SCROLL_STATE("[0x%X]", this);
@@
-1716,6
+1716,7
@@
void ScrollView::EnableScrollOvershoot(bool enable)
void ScrollView::AddOverlay(Actor actor)
{
void ScrollView::AddOverlay(Actor actor)
{
+ actor.SetDrawMode( DrawMode::OVERLAY_2D );
mInternalActor.Add( actor );
}
mInternalActor.Add( actor );
}
@@
-2438,11
+2439,6
@@
void ScrollView::OnPan( const PanGesture& gesture )
{
mScrollMainInternalPrePositionConstraint.Remove();
}
{
mScrollMainInternalPrePositionConstraint.Remove();
}
-
- if( mOvershootIndicator )
- {
- mOvershootIndicator->ClearOvershoot();
- }
}
else
{
}
else
{