From 906b5eed2f9ddd8c03ac4b7b4b6aee7547bab42d Mon Sep 17 00:00:00 2001
From: Paul Wisbey
Date: Tue, 11 Aug 2015 13:24:32 +0100
Subject: [PATCH] Use OVERLAY_2D for scroll overshoot etc.
Change-Id: I6d2461e5377ab467390eeed74c2122047640b513
---
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp | 2 ++
.../internal/controls/scrollable/scroll-view/scroll-view-impl.cpp | 1 +
2 files changed, 3 insertions(+)
diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
index c4d2840..9cb8aff 100644
--- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@ -1427,6 +1427,7 @@ Vector2 ItemView::GetCurrentScrollPosition() const
void ItemView::AddOverlay(Actor actor)
{
+ actor.SetDrawMode( DrawMode::OVERLAY_2D );
Self().Add(actor);
}
@@ -1479,6 +1480,7 @@ void ItemView::EnableScrollOvershoot( bool enable )
mOvershootOverlay.SetColor(mOvershootEffectColor);
mOvershootOverlay.SetParentOrigin(ParentOrigin::TOP_LEFT);
mOvershootOverlay.SetAnchorPoint(AnchorPoint::TOP_LEFT);
+ mOvershootOverlay.SetDrawMode( DrawMode::OVERLAY_2D );
self.Add(mOvershootOverlay);
Constraint constraint = Constraint::New( mOvershootOverlay, Actor::Property::SIZE, OvershootOverlaySizeConstraint );
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 d398a26..86e9173 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
@@ -1716,6 +1716,7 @@ void ScrollView::EnableScrollOvershoot(bool enable)
void ScrollView::AddOverlay(Actor actor)
{
+ actor.SetDrawMode( DrawMode::OVERLAY_2D );
mInternalActor.Add( actor );
}
--
2.7.4