[dali_2.3.20] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / page-turn-view / page-turn-portrait-view-impl.h

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..598b682 100644 (file)
--- 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
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H__
-#define __DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H__
+#ifndef DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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,38 +19,34 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h>
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 /**
  * Implementation class of the PageTurnView in portrait mode
  */
 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 );
+  static Toolkit::PageTurnPortraitView New(PageFactory& pageFactory, const Vector2& viewPageSize);
 
 protected:
-
   /**
    * Constructor.
    * It initializes the PageTurnPortraitView members
+   * @param[in] pageFactory The factory which provides image to PageTurnView as the page content.
+   * @param[in] viewPageSize The size of the page
    */
-  PageTurnPortraitView( PageFactory& pageFactory, const Vector2& pageSize );
+  PageTurnPortraitView(PageFactory& pageFactory, const Vector2& viewPageSize);
 
   /**
    * A reference counted object may only be deleted by calling Unreference()
@@ -58,52 +54,43 @@ protected:
   virtual ~PageTurnPortraitView();
 
 protected: // From PageTurnView
-
   /**
    * @copydoc PageTurnView::OnPageTurnViewInitialize
    */
-  virtual void OnPageTurnViewInitialize();
-
-  /**
-   * @copydoc PageTurnView::NewPageFromRenderBuffer
-   */
-  virtual ImageActor NewPageFromRenderBuffer( int pageIndex );
+  void OnPageTurnViewInitialize() override;
 
   /**
    * @copydoc PageTurnView::SetPanPosition
    */
-  virtual Vector2 SetPanPosition( const Vector2& gesturePosition );
+  Vector2 SetPanPosition(const Vector2& gesturePosition) override;
 
   /**
    * @copydoc PageTurnView::SetPanActor
    */
-  virtual void SetPanActor( const Vector2& panPosition );
+  void SetPanActor(const Vector2& panPosition) override;
 
   /**
-   * @copydoc PageTurnView::SetSpineEffect
+   * @copydoc PageTurnView::OnPossibleOutwardsFlick
    */
-  virtual void SetSpineEffect(ImageActor actor, bool isLeftSide);
+  void OnPossibleOutwardsFlick(const Vector2& panPosition, float gestureSpeed) override;
 
   /**
-   * @copydoc PageTurnView::OnPossibleOutwardsFlick
+   * @copydoc PageTurnView::OnTurnedOver
    */
-  virtual void OnPossibleOutwardsFlick( const Vector2& panPosition, float gestureSpeed );
+  void OnTurnedOver(Actor actor, bool isLeftSide) override;
 
 private:
-
   /**
    * @copydoc PageTurnView::TurnedOver
    */
-  void OnTurnedOver( Animation& animation );
+  void TurnedOverBackwards(Animation& animation);
 
 private:
-
   //Undefined
-  PageTurnPortraitView( const PageTurnPortraitView& );
+  PageTurnPortraitView(const PageTurnPortraitView&);
 
   //undefined
   PageTurnPortraitView& operator=(const PageTurnPortraitView& rhs);
-
 };
 
 } // namespace Internal
@@ -111,4 +98,5 @@ private:
 } // namespace Toolkit
 
 } // namespace Dali
-#endif /* __DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H__ */
+
+#endif // DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H