X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-landscape-view-impl.h;h=c28594b54f6f70dfa907c4fbe9febcddb5607388;hb=410125f32fcd135226a2a0a668b2855ea9e17a69;hp=5dc56b647c550bab721410c698e5f1734813123b;hpb=e2eda444afbe82e9591fe198eef339227f90a616;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h index 5dc56b6..c28594b 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h @@ -1,24 +1,25 @@ #ifndef __DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H__ #define __DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H__ -// -// 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) 2016 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. + * + */ // INTERNAL INCLUDES -#include +#include #include namespace Dali @@ -35,15 +36,16 @@ class PageTurnLandscapeView : public PageTurnView public: /** - * Create a new PageTurnLandscapeView - * @return A handle to the newly allocated PageTurnLandscapeView + * @copydoc Toolkit::PageTurnLandscapeView::New( PageFactory&, const Vector2& ) */ static Toolkit::PageTurnLandscapeView New( PageFactory& pageFactory, const Vector2& pageSize ); protected: /** * Constructor. - * It initializes the PageTurnLandscapeView members + * It initializes the PageTurnPortraitView members + * @param[in] pageFactory The factory which provides image to PageTurnView as the page content. + * @param[in] pageSize The size of the page */ PageTurnLandscapeView( PageFactory& pageFactory, const Vector2& pageSize ); @@ -60,14 +62,9 @@ protected: // From PageTurnView virtual void OnPageTurnViewInitialize(); /** - * copydoc PageTurnView::NewPAgeFromRenderBuffer - */ - virtual ImageActor NewPageFromRenderBuffer( int pageIndex ); - - /** * @copydoc PageTurnView::OnAddPage */ - virtual void OnAddPage( ImageActor newPage, bool isLeftSide ); + virtual void OnAddPage( Actor newPage, bool isLeftSide ); /** * @copydoc PageTurnView::SetPanPosition @@ -79,11 +76,6 @@ protected: // From PageTurnView */ virtual void SetPanActor( const Vector2& panPosition ); - /** - * @copydoc PageTurnView::SetSpineEffect - */ - virtual void SetSpineEffect(Actor actor, bool isLeftSide); - private: //Undefined