projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug in model3d-view control
[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
f64e351
..
2d07779
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
@@
-19,7
+19,7
@@
*/
// INTERNAL INCLUDES
*/
// INTERNAL INCLUDES
-#include <dali-toolkit/
devel
-api/controls/page-turn-view/page-turn-portrait-view.h>
+#include <dali-toolkit/
public
-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
#include <dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h>
namespace Dali
@@
-39,8
+39,7
@@
class PageTurnPortraitView : public PageTurnView
public:
/**
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& pageSize );
@@
-49,6
+48,8
@@
protected:
/**
* Constructor.
* It initializes the PageTurnPortraitView members
/**
* 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 );
*/
PageTurnPortraitView( PageFactory& pageFactory, const Vector2& pageSize );
@@
-65,11
+66,6
@@
protected: // From PageTurnView
virtual void OnPageTurnViewInitialize();
/**
virtual void OnPageTurnViewInitialize();
/**
- * @copydoc PageTurnView::NewPageFromRenderBuffer
- */
- virtual ImageActor NewPageFromRenderBuffer( int pageIndex );
-
- /**
* @copydoc PageTurnView::SetPanPosition
*/
virtual Vector2 SetPanPosition( const Vector2& gesturePosition );
* @copydoc PageTurnView::SetPanPosition
*/
virtual Vector2 SetPanPosition( const Vector2& gesturePosition );
@@
-80,21
+76,21
@@
protected: // From PageTurnView
virtual void SetPanActor( const Vector2& panPosition );
/**
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::On
PossibleOutwardsFlick
+ * @copydoc PageTurnView::On
TurnedOver
*/
*/
- virtual void On
PossibleOutwardsFlick( const Vector2& panPosition, float gestureSpeed
);
+ virtual void On
TurnedOver( Actor actor, bool isLeftSide
);
private:
/**
* @copydoc PageTurnView::TurnedOver
*/
private:
/**
* @copydoc PageTurnView::TurnedOver
*/
- void
OnTurnedOver
( Animation& animation );
+ void
TurnedOverBackwards
( Animation& animation );
private:
private: