[dali_1.4.53] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / public-api / actors / layer.cpp

diff --git a/dali/public-api/actors/layer.cpp b/dali/public-api/actors/layer.cpp
index c8c1413..5e31ff7 100644 (file)
--- a/dali/public-api/actors/layer.cpp
+++ b/dali/public-api/actors/layer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 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.
@@ -58,7 +58,7 @@ Layer& Layer::operator=(const Layer& rhs)
   return *this;
 }
 
-unsigned int Layer::GetDepth() const
+uint32_t Layer::GetDepth() const
 {
   return GetImplementation(*this).GetDepth();
 }
@@ -103,6 +103,16 @@ void Layer::MoveBelow( Layer target )
   GetImplementation(*this).MoveBelow( GetImplementation( target ) );
 }
 
+void Layer::SetBehavior( Behavior behavior )
+{
+  GetImplementation(*this).SetBehavior( behavior );
+}
+
+Layer::Behavior Layer::GetBehavior() const
+{
+  return GetImplementation(*this).GetBehavior();
+}
+
 void Layer::SetClipping(bool enabled)
 {
   GetImplementation(*this).SetClipping(enabled);
@@ -113,7 +123,7 @@ bool Layer::IsClipping() const
   return GetImplementation(*this).IsClipping();
 }
 
-void Layer::SetClippingBox(int x, int y, int width, int height)
+void Layer::SetClippingBox(int32_t x, int32_t y, int32_t width, int32_t height)
 {
   GetImplementation(*this).SetClippingBox(x, y, width, height);
 }
@@ -138,11 +148,6 @@ bool Layer::IsDepthTestDisabled() const
   return GetImplementation(*this).IsDepthTestDisabled();
 }
 
-float Layer::ZValue(const Vector3& position, float sortModifier)
-{
-  return Internal::Layer::ZValue( position, sortModifier );
-}
-
 void Layer::SetSortFunction(SortFunctionType function)
 {
   GetImplementation(*this).SetSortFunction(function);
@@ -174,4 +179,3 @@ Layer::Layer(Internal::Layer* internal)
 }
 
 } // namespace Dali
-