X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=optional%2Fdali-toolkit%2Finternal%2Fcontrols%2Fview%2Fview-impl.cpp;h=d98fc47e949132892aa969ac6b6cee537daf6406;hb=680c5587a1478717393d3a03cf6a17801edd00e0;hp=b27d509fabaec4b81b4e80335c2b104bf5614816;hpb=d725a0d2d6b11eff469c9a4d2c13df9e00e6b85f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.cpp b/optional/dali-toolkit/internal/controls/view/view-impl.cpp index b27d509..d98fc47 100644 --- a/optional/dali-toolkit/internal/controls/view/view-impl.cpp +++ b/optional/dali-toolkit/internal/controls/view/view-impl.cpp @@ -1,24 +1,27 @@ -// -// 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 "view-impl.h" // EXTERNAL INCLUDES +#include +#include +#include // INTERNAL INCLUDES @@ -230,8 +233,6 @@ void View::OrientationChanged( Dali::Orientation orientation ) } } - mRotateAnimation.SetDestroyAction( Animation::Bake ); - Toolkit::View handle( GetOwner() ); mOrientationAnimationStartedSignalV2.Emit( handle, mRotateAnimation, orientation ); @@ -269,7 +270,7 @@ bool View::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* trac } View::View(bool fullscreen) -: Control( false ), // doesn't require touch events +: Control( CONTROL_BEHAVIOUR_NONE ), mOrientation( -1 ), mFullScreen(fullscreen), mContentLayers(),