X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-view-impl.cpp;h=20c57c00c85ead854a7e5b43b2ab490d5569cc5d;hb=1f316c7e8f22f1ada38dfdff44d556205bb40ca4;hp=2fea47915967c51c7e289817f4b19aba0e228937;hpb=a2de9cf491172cd5da9dc9ed60b17683dab6d7bc;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp index 2fea479..20c57c0 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include // INTERNAL INCLUDES @@ -32,9 +32,6 @@ #include #include -// headers needed for backward compatibility of PageFactory::NewPage(pageId) API -#include - using namespace Dali; namespace //Unnamed namespace @@ -320,6 +317,7 @@ void PageTurnView::Page::UseEffect(Shader newShader, Geometry geometry) } renderer.SetTextures( textureSet ); + renderer.SetProperty( Renderer::Property::DEPTH_WRITE_MODE, DepthWriteMode::ON ); actor.AddRenderer( renderer ); } } @@ -351,7 +349,7 @@ void PageTurnView::Page::SetCurrentCenter( const Vector2& value ) } PageTurnView::PageTurnView( PageFactory& pageFactory, const Vector2& pageSize ) -: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS ) ), +: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), mPageFactory( &pageFactory ), mPageSize( pageSize ), mSpineShadowParameter( DEFAULT_SPINE_SHADOW_PARAMETER ), @@ -393,7 +391,6 @@ void PageTurnView::OnInitialize() uint16_t width = static_cast(mPageSize.width / DEFAULT_GRID_DENSITY + 0.5f); uint16_t height = static_cast(mPageSize.height / DEFAULT_GRID_DENSITY + 0.5f); mGeometry = RendererFactoryCache::CreateGridGeometry( Uint16Pair( width, height ) ); - mGeometry.SetRequiresDepthTesting( true ); mPages.reserve( NUMBER_OF_CACHED_PAGES ); for( int i = 0; i < NUMBER_OF_CACHED_PAGES; i++ )