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.3.21] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
page-turn-view
/
page-turn-landscape-view-impl.h
diff --git
a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
index
2033649
..
fbd29a0
100644
(file)
--- a/
dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
+++ b/
dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H__
-#define
__DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H__
+#ifndef
DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H
+#define
DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H
/*
/*
- * Copyright (c) 20
14
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
21
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,34
+19,31
@@
*/
// INTERNAL INCLUDES
*/
// INTERNAL INCLUDES
-#include <dali-toolkit/
public
-api/controls/page-turn-view/page-turn-landscape-view.h>
+#include <dali-toolkit/
devel
-api/controls/page-turn-view/page-turn-landscape-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
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
class PageTurnLandscapeView : public PageTurnView
{
public:
class PageTurnLandscapeView : public PageTurnView
{
public:
-
/**
/**
- * Create a new PageTurnLandscapeView
- * @return A handle to the newly allocated PageTurnLandscapeView
+ * @copydoc Toolkit::PageTurnLandscapeView::New( PageFactory&, const Vector2& )
*/
*/
- static Toolkit::PageTurnLandscapeView New(
PageFactory& pageFactory, const Vector2& pageSize
);
+ static Toolkit::PageTurnLandscapeView New(
PageFactory& pageFactory, const Vector2& viewPageSize
);
protected:
/**
* Constructor.
protected:
/**
* Constructor.
- * It initializes the PageTurnLandscapeView members
+ * 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
*/
*/
- PageTurnLandscapeView(
PageFactory& pageFactory, const Vector2& pageSize
);
+ PageTurnLandscapeView(
PageFactory& pageFactory, const Vector2& viewPageSize
);
/**
* A reference counted object may only be deleted by calling Unreference()
/**
* A reference counted object may only be deleted by calling Unreference()
@@
-54,40
+51,32
@@
protected:
virtual ~PageTurnLandscapeView();
protected: // From PageTurnView
virtual ~PageTurnLandscapeView();
protected: // From PageTurnView
-
/**
* @copydoc PageTurnView::OnPageTurnViewInitialize
*/
/**
* @copydoc PageTurnView::OnPageTurnViewInitialize
*/
- v
irtual void OnPageTurnViewInitialize()
;
+ v
oid OnPageTurnViewInitialize() override
;
/**
* @copydoc PageTurnView::OnAddPage
*/
/**
* @copydoc PageTurnView::OnAddPage
*/
- v
irtual void OnAddPage( ImageActor newPage, bool isLeftSide )
;
+ v
oid OnAddPage(Actor newPage, bool isLeftSide) 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
*/
- virtual void SetPanActor( const Vector2& panPosition );
-
- /**
- * @copydoc PageTurnView::SetSpineEffect
- */
- virtual void SetSpineEffect(ImageActor actor, bool isLeftSide);
+ void SetPanActor(const Vector2& panPosition) override;
private:
private:
-
//Undefined
//Undefined
- PageTurnLandscapeView(
const PageTurnLandscapeView&
);
+ PageTurnLandscapeView(
const PageTurnLandscapeView&
);
//undefined
PageTurnLandscapeView& operator=(const PageTurnLandscapeView& rhs);
//undefined
PageTurnLandscapeView& operator=(const PageTurnLandscapeView& rhs);
-
};
} // namespace Internal
};
} // namespace Internal
@@
-95,4
+84,5
@@
private:
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali
-#endif /* __DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H__ */
+
+#endif // DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H