X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-portrait-view-impl.h;h=1a4b00139bba92d67b0e1b7c6eb107948ac41d61;hb=1498b458e65cce375898c232cfa87c831b1f1c6b;hp=cc2e5ec14015fcab777cea6f78140d3299740df1;hpb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h index cc2e5ec..1a4b001 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * 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. @@ -19,7 +19,7 @@ */ // INTERNAL INCLUDES -#include +#include #include namespace Dali @@ -39,8 +39,7 @@ class PageTurnPortraitView : public PageTurnView public: /** - * Create a new PageTurnPortraitView - * @return A handle to the newly allocated PageTurnPortraitView + * @copydoc Toolkit::PageTurnPortraitView::New( PageFactory&, const Vector2& ) */ static Toolkit::PageTurnPortraitView New( PageFactory& pageFactory, const Vector2& pageSize ); @@ -49,6 +48,8 @@ protected: /** * Constructor. * 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 */ PageTurnPortraitView( PageFactory& pageFactory, const Vector2& pageSize ); @@ -65,11 +66,6 @@ protected: // From PageTurnView virtual void OnPageTurnViewInitialize(); /** - * @copydoc PageTurnView::NewPageFromRenderBuffer - */ - virtual ImageActor NewPageFromRenderBuffer( int pageIndex ); - - /** * @copydoc PageTurnView::SetPanPosition */ virtual Vector2 SetPanPosition( const Vector2& gesturePosition ); @@ -80,21 +76,21 @@ protected: // From PageTurnView virtual void SetPanActor( const Vector2& panPosition ); /** - * @copydoc PageTurnView::SetSpineEffect + * @copydoc PageTurnView::OnPossibleOutwardsFlick */ - virtual void SetSpineEffect(ImageActor actor, bool isLeftSide); + virtual void OnPossibleOutwardsFlick( const Vector2& panPosition, float gestureSpeed ); /** - * @copydoc PageTurnView::OnPossibleOutwardsFlick + * @copydoc PageTurnView::OnTurnedOver */ - virtual void OnPossibleOutwardsFlick( const Vector2& panPosition, float gestureSpeed ); + virtual void OnTurnedOver( Actor actor, bool isLeftSide ); private: /** * @copydoc PageTurnView::TurnedOver */ - void OnTurnedOver( Animation& animation ); + void TurnedOverBackwards( Animation& animation ); private: