X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscroll-view%2Fscroll-view-impl.cpp;h=a8bd61ee22b5e5bbbaa4717028ffc59fbcc30768;hb=9fd0114ee708e9c197cc539b09acc6b8eaaf1c61;hp=ba36907644205bdce19e5ac33ebddc3d5de50b48;hpb=c3f7ea6cb0c0b75c2276193aff88b5c7a679a2d5;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 ba36907..a8bd61e 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp @@ -624,7 +624,6 @@ void ScrollView::OnInitialize() // Internal Actor, used to hide actors from enumerations. // Also actors added to Internal actor appear as overlays e.g. ScrollBar components. mInternalActor = Actor::New(); - mInternalActor.SetDrawMode(DrawMode::OVERLAY); self.Add(mInternalActor); mInternalActor.SetParentOrigin(ParentOrigin::CENTER); @@ -658,7 +657,7 @@ void ScrollView::OnInitialize() SetInternalConstraints(); } -void ScrollView::OnStageConnection() +void ScrollView::OnStageConnection( int depth ) { DALI_LOG_SCROLL_STATE("[0x%X]", this); @@ -1717,6 +1716,7 @@ void ScrollView::EnableScrollOvershoot(bool enable) void ScrollView::AddOverlay(Actor actor) { + actor.SetDrawMode( DrawMode::OVERLAY_2D ); mInternalActor.Add( actor ); } @@ -2439,11 +2439,6 @@ void ScrollView::OnPan( const PanGesture& gesture ) { mScrollMainInternalPrePositionConstraint.Remove(); } - - if( mOvershootIndicator ) - { - mOvershootIndicator->ClearOvershoot(); - } } else {