X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Factors%2Fcustom-actor-internal.cpp;h=acfd82c1f9e1f99c50c3c3f6cecd05bb19727537;hb=4dc37629dd59d48e00bf17496ba0b76fe137af0c;hp=97405b7d155ee1f5dd88115c4d683e608f9dff25;hpb=8f2c5571c924479b6a07a2c2187dedd9c685baf0;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/actors/custom-actor-internal.cpp b/dali/internal/event/actors/custom-actor-internal.cpp index 97405b7..acfd82c 100644 --- 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 @@ -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()