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
Merge "Fix text and control depth indices to have sane values" into 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
..
0adb4e5
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
@@
-65,11
+65,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 );
@@
-89,12
+84,14
@@
protected: // From PageTurnView
*/
virtual void OnPossibleOutwardsFlick( const Vector2& panPosition, float gestureSpeed );
*/
virtual void OnPossibleOutwardsFlick( const Vector2& panPosition, float gestureSpeed );
+ virtual void OnTurnedOver( ImageActor actor, bool isLeftSide );
+
private:
/**
* @copydoc PageTurnView::TurnedOver
*/
private:
/**
* @copydoc PageTurnView::TurnedOver
*/
- void
OnTurnedOver
( Animation& animation );
+ void
TurnedOverBackwards
( Animation& animation );
private:
private: