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 "Add APIs of webview back forward list" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
item-view
/
grid-layout.h
diff --git
a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h
b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h
index
8cbdd33
..
8317395
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h
+++ b/
dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_GRID_LAYOUT_H__
-#define
__DALI_TOOLKIT_GRID_LAYOUT_H__
+#ifndef
DALI_TOOLKIT_GRID_LAYOUT_H
+#define
DALI_TOOLKIT_GRID_LAYOUT_H
/*
/*
- * Copyright (c) 20
15
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.
@@
-22,15
+22,14
@@
#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal
{
namespace Internal
{
-
class GridLayout;
typedef IntrusivePtr<GridLayout> GridLayoutPtr; ///< Pointer to a Dali::Toolkit::GridLayout object
class GridLayout;
typedef IntrusivePtr<GridLayout> GridLayoutPtr; ///< Pointer to a Dali::Toolkit::GridLayout object
@@
-41,7
+40,6
@@
typedef IntrusivePtr<GridLayout> GridLayoutPtr; ///< Pointer to a Dali::Toolkit:
class GridLayout : public ItemLayout
{
public:
class GridLayout : public ItemLayout
{
public:
-
/**
* @brief Create a new grid layout.
*/
/**
* @brief Create a new grid layout.
*/
@@
-53,6
+51,12
@@
public:
virtual ~GridLayout();
/**
virtual ~GridLayout();
/**
+ * Apply grid layout Properties.
+ * @param[in] properties The properties of the layout.
+ */
+ void SetGridLayoutProperties(const Property::Map& properties);
+
+ /**
* @brief Set the number of columns in the layout.
*
* @param[in] columns The number of columns.
* @brief Set the number of columns in the layout.
*
* @param[in] columns The number of columns.
@@
-179,84
+183,88
@@
public:
/**
* @copydoc ItemLayout::GetScrollSpeedFactor()
*/
/**
* @copydoc ItemLayout::GetScrollSpeedFactor()
*/
-
virtual float GetScrollSpeedFactor() const
;
+
float GetScrollSpeedFactor() const override
;
/**
* @copydoc ItemLayout::GetMaximumSwipeSpeed()
*/
/**
* @copydoc ItemLayout::GetMaximumSwipeSpeed()
*/
-
virtual float GetMaximumSwipeSpeed() const
;
+
float GetMaximumSwipeSpeed() const override
;
/**
* @copydoc ItemLayout::GetItemFlickAnimationDuration()
*/
/**
* @copydoc ItemLayout::GetItemFlickAnimationDuration()
*/
-
virtual float GetItemFlickAnimationDuration() const
;
+
float GetItemFlickAnimationDuration() const override
;
/**
* @copydoc ItemLayout::GetClosestOnScreenLayoutPosition()
*/
/**
* @copydoc ItemLayout::GetClosestOnScreenLayoutPosition()
*/
-
virtual float GetClosestOnScreenLayoutPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize)
;
+
float GetClosestOnScreenLayoutPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) override
;
/**
* @copydoc ItemLayout::GetNextFocusItemID()
*/
/**
* @copydoc ItemLayout::GetNextFocusItemID()
*/
-
virtual int GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled)
;
+
int GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled) override
;
private:
private:
-
/**
* @copydoc ItemLayout::GetMinimumLayoutPosition()
*/
/**
* @copydoc ItemLayout::GetMinimumLayoutPosition()
*/
-
virtual float GetMinimumLayoutPosition(unsigned int numberOfItems, Vector3 layoutSize) const
;
+
float GetMinimumLayoutPosition(unsigned int numberOfItems, Vector3 layoutSize) const override
;
/**
* @copydoc ItemLayout::GetClosestAnchorPosition()
*/
/**
* @copydoc ItemLayout::GetClosestAnchorPosition()
*/
-
virtual float GetClosestAnchorPosition(float layoutPosition) const
;
+
float GetClosestAnchorPosition(float layoutPosition) const override
;
/**
* @copydoc ItemLayout::GetItemScrollToPosition()
*/
/**
* @copydoc ItemLayout::GetItemScrollToPosition()
*/
-
virtual float GetItemScrollToPosition(unsigned int itemId) const
;
+
float GetItemScrollToPosition(unsigned int itemId) const override
;
/**
* @copydoc ItemLayout::GetItemsWithinArea()
*/
/**
* @copydoc ItemLayout::GetItemsWithinArea()
*/
-
virtual ItemRange GetItemsWithinArea(float firstItemPosition, Vector3 layoutSize) const
;
+
ItemRange GetItemsWithinArea(float firstItemPosition, Vector3 layoutSize) const override
;
/**
* @copydoc ItemLayout::GetReserveItemCount()
*/
/**
* @copydoc ItemLayout::GetReserveItemCount()
*/
-
virtual unsigned int GetReserveItemCount(Vector3 layoutSize) const
;
+
unsigned int GetReserveItemCount(Vector3 layoutSize) const override
;
/**
* @copydoc ItemLayout::GetDefaultItemSize()
*/
/**
* @copydoc ItemLayout::GetDefaultItemSize()
*/
- v
irtual void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const
;
+ v
oid GetDefaultItemSize(unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize) const override
;
/**
* @copydoc ItemLayout::GetScrollDirection()
*/
/**
* @copydoc ItemLayout::GetScrollDirection()
*/
-
virtual Degree GetScrollDirection() const
;
+
Degree GetScrollDirection() const override
;
/**
* @copydoc ItemLayout::ApplyConstraints()
*/
/**
* @copydoc ItemLayout::ApplyConstraints()
*/
- v
irtual void ApplyConstraints( Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor )
;
+ v
oid ApplyConstraints(Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor) override
;
/**
* @copydoc ItemLayout::GetItemPosition()
*/
/**
* @copydoc ItemLayout::GetItemPosition()
*/
-
virtual Vector3 GetItemPosition( int itemID, float currentLayoutPosition, const Vector3& layoutSize ) const
;
+
Vector3 GetItemPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) const override
;
protected:
protected:
-
/**
* @brief Protected constructor; see also GridLayout::New().
*/
GridLayout();
private:
/**
* @brief Protected constructor; see also GridLayout::New().
*/
GridLayout();
private:
+ // Undefined
+ GridLayout(const GridLayout& itemLayout);
+
+ // Undefined
+ GridLayout& operator=(const GridLayout& rhs);
+private:
struct Impl;
Impl* mImpl;
};
struct Impl;
Impl* mImpl;
};
@@
-267,4
+275,4
@@
private:
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_GRID_LAYOUT_H__
+#endif //
DALI_TOOLKIT_GRID_LAYOUT_H