X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Fnodes%2Fscene-graph-layer.cpp;h=d23419cfd0a3fcfb574dda569e6778faf5818164;hb=55827866fcb8c7ee47581ac4335a3390472090e8;hp=46bb14cb00ddf998d64eea6eda5a155e0f18ddca;hpb=78f33f00abde38801e76509b624fde9226005634;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/update/nodes/scene-graph-layer.cpp b/dali/internal/update/nodes/scene-graph-layer.cpp old mode 100644 new mode 100755 index 46bb14c..d23419c --- a/dali/internal/update/nodes/scene-graph-layer.cpp +++ b/dali/internal/update/nodes/scene-graph-layer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,10 +39,11 @@ SceneGraph::Layer* Layer::New() } Layer::Layer() -: mSortFunction( Internal::Layer::ZValue ), +: Node(), + mSortFunction( Internal::Layer::ZValue ), mClippingBox( 0,0,0,0 ), mLastCamera( NULL ), - mBehavior( Dali::Layer::LAYER_2D ), + mBehavior( Dali::Layer::LAYER_UI ), mIsClipping( false ), mDepthTestDisabled( true ), mIsDefaultSortFunction( true ) @@ -63,6 +64,7 @@ void Layer::SetSortFunction( Dali::Layer::SortFunctionType function ) { if( mSortFunction != function ) { + SetPropertyDirty( true ); // is a custom sort function used if( function != Internal::Layer::ZValue ) { @@ -83,21 +85,25 @@ void Layer::SetSortFunction( Dali::Layer::SortFunctionType function ) void Layer::SetClipping(bool enabled) { mIsClipping = enabled; + SetPropertyDirty( true ); } void Layer::SetClippingBox(const Dali::ClippingBox& box) { mClippingBox.Set(box.x, box.y, box.width, box.height); + SetPropertyDirty( true ); } void Layer::SetBehavior( Dali::Layer::Behavior behavior ) { mBehavior = behavior; + SetPropertyDirty( true ); } void Layer::SetDepthTestDisabled( bool disable ) { mDepthTestDisabled = disable; + SetPropertyDirty( true ); } bool Layer::IsDepthTestDisabled() const @@ -113,15 +119,6 @@ void Layer::ClearRenderables() } // namespace SceneGraph -template <> -void OwnerPointer::Reset() -{ - if( mObject != NULL ) - { - Dali::Internal::SceneGraph::Node::Delete( mObject ); - mObject = NULL; - } -} } // namespace Internal } // namespace Dali