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
[dali_2.0.4] 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
..
358ad76
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) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
*
* 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
*/
// 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
#include <dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h>
namespace Dali
@@
-39,18
+39,19
@@
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&
p
ageSize );
+ static Toolkit::PageTurnPortraitView New( PageFactory& pageFactory, const Vector2&
viewP
ageSize );
protected:
/**
* Constructor.
* It initializes the PageTurnPortraitView members
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&
p
ageSize );
+ PageTurnPortraitView( PageFactory& pageFactory, const Vector2&
viewP
ageSize );
/**
* A reference counted object may only be deleted by calling Unreference()
/**
* A reference counted object may only be deleted by calling Unreference()
@@
-62,39
+63,34
@@
protected: // From PageTurnView
/**
* @copydoc PageTurnView::OnPageTurnViewInitialize
*/
/**
* @copydoc PageTurnView::OnPageTurnViewInitialize
*/
- virtual void OnPageTurnViewInitialize();
-
- /**
- * @copydoc PageTurnView::NewPageFromRenderBuffer
- */
- virtual ImageActor NewPageFromRenderBuffer( int pageIndex );
+ void OnPageTurnViewInitialize() override;
/**
* @copydoc PageTurnView::SetPanPosition
*/
/**
* @copydoc PageTurnView::SetPanPosition
*/
-
virtual Vector2 SetPanPosition( const Vector2& gesturePosition )
;
+
Vector2 SetPanPosition( const Vector2& gesturePosition ) override
;
/**
* @copydoc PageTurnView::SetPanActor
*/
/**
* @copydoc PageTurnView::SetPanActor
*/
- v
irtual void SetPanActor( const Vector2& panPosition )
;
+ v
oid SetPanActor( const Vector2& panPosition ) override
;
/**
/**
- * @copydoc PageTurnView::
SetSpineEffect
+ * @copydoc PageTurnView::
OnPossibleOutwardsFlick
*/
*/
- v
irtual void SetSpineEffect(ImageActor actor, bool isLeftSide)
;
+ v
oid OnPossibleOutwardsFlick( const Vector2& panPosition, float gestureSpeed ) override
;
/**
/**
- * @copydoc PageTurnView::On
PossibleOutwardsFlick
+ * @copydoc PageTurnView::On
TurnedOver
*/
*/
- v
irtual void OnPossibleOutwardsFlick( const Vector2& panPosition, float gestureSpeed )
;
+ v
oid OnTurnedOver( Actor actor, bool isLeftSide ) override
;
private:
/**
* @copydoc PageTurnView::TurnedOver
*/
private:
/**
* @copydoc PageTurnView::TurnedOver
*/
- void
OnTurnedOver
( Animation& animation );
+ void
TurnedOverBackwards
( Animation& animation );
private:
private:
@@
-111,4
+107,5
@@
private:
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali
-#endif /* __DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H__ */
+
+#endif // DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H