Stop using ImageActor in PageTurnView

[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 dde9f99..6fb4c62 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,21 +1,22 @@
 #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.
-//
-// 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.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h>
@@ -38,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 );
 
@@ -48,6 +48,8 @@ protected:
   /**
    * Constructor.
    * It initializes the PageTurnPortraitView members
+   * @param[in] pageFactory The factory which provides image actors to PageTurnView as the page content.
+   * @param[in] pageSize The size of the page
    */
   PageTurnPortraitView( PageFactory& pageFactory, const Vector2& pageSize );
 
@@ -64,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 );
@@ -79,21 +76,21 @@ protected: // From PageTurnView
   virtual void SetPanActor( const Vector2& panPosition );
 
   /**
-   * @copydoc PageTurnView::SetSpineEffect
+   * @copydoc PageTurnView::OnPossibleOutwardsFlick
    */
-  virtual void SetSpineEffect(Actor 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: