Merge "Remove extension from shader." into devel/new_mesh

[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 4f7cbe4..300ee69 100644 (file)
--- a/dali/public-api/actors/layer.cpp
+++ b/dali/public-api/actors/layer.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 #include <dali/public-api/actors/layer.h>
@@ -26,12 +27,6 @@ namespace Dali
 
 using Dali::Layer;
 
-const char* const Layer::ACTION_RAISE = "raise";
-const char* const Layer::ACTION_LOWER = "lower";
-const char* const Layer::ACTION_RAISE_TO_TOP = "raise-to-top";
-const char* const Layer::ACTION_LOWER_TO_BOTTOM = "lower-to-bottom";
-
-
 Layer::Layer()
 {
 }
@@ -52,6 +47,17 @@ Layer::~Layer()
 {
 }
 
+Layer::Layer(const Layer& copy)
+: Actor(copy)
+{
+}
+
+Layer& Layer::operator=(const Layer& rhs)
+{
+  BaseHandle::operator=(rhs);
+  return *this;
+}
+
 unsigned int Layer::GetDepth() const
 {
   return GetImplementation(*this).GetDepth();
@@ -132,14 +138,29 @@ bool Layer::IsDepthTestDisabled() const
   return GetImplementation(*this).IsDepthTestDisabled();
 }
 
-float Layer::ZValue(const Vector3& position, float sortModifier)
+void Layer::SetSortFunction(SortFunctionType function)
 {
-  return Internal::Layer::ZValue( position, sortModifier );
+  GetImplementation(*this).SetSortFunction(function);
 }
 
-void Layer::SetSortFunction(SortFunctionType function)
+void Layer::SetTouchConsumed( bool consume )
 {
-  GetImplementation(*this).SetSortFunction(function);
+  GetImplementation( *this ).SetTouchConsumed( consume );
+}
+
+bool Layer::IsTouchConsumed() const
+{
+  return GetImplementation( *this ).IsTouchConsumed();
+}
+
+void Layer::SetHoverConsumed( bool consume )
+{
+  GetImplementation( *this ).SetHoverConsumed( consume );
+}
+
+bool Layer::IsHoverConsumed() const
+{
+  return GetImplementation( *this ).IsHoverConsumed();
 }
 
 Layer::Layer(Internal::Layer* internal)
@@ -148,4 +169,3 @@ Layer::Layer(Internal::Layer* internal)
 }
 
 } // namespace Dali
-