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

[platform/core/uifw/dali-core.git] / dali / internal / event / actors / custom-actor-internal.cpp

diff --git a/dali/internal/event/actors/custom-actor-internal.cpp b/dali/internal/event/actors/custom-actor-internal.cpp
index 97405b7..acfd82c 100644 (file)
--- a/dali/internal/event/actors/custom-actor-internal.cpp
+++ b/dali/internal/event/actors/custom-actor-internal.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) 2014 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/internal/event/actors/custom-actor-internal.h>
@@ -39,7 +40,9 @@ CustomActor::CustomActor(CustomActorImpl& extension)
   mImpl( &extension )
 {
   mDerivedRequiresTouch = extension.RequiresTouchEvents();
-  mDerivedRequiresMouseWheelEvent = extension.RequiresMouseWheelEvents();
+  mDerivedRequiresHover = extension.RequiresHoverEvents();
+  mDerivedRequiresWheelEvent = extension.RequiresWheelEvents();
+  SetRelayoutEnabled( extension.IsRelayoutEnabled() );
 }
 
 CustomActor::~CustomActor()