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 "Added nested TableView KeyboardFocus support" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
item-view
/
depth-layout.h
diff --git
a/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.h
b/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.h
old mode 100644
(file)
new mode 100755
(executable)
index
1d16a03
..
a59b7fe
--- a/
dali-toolkit/internal/controls/scrollable/item-view/depth-layout.h
+++ b/
dali-toolkit/internal/controls/scrollable/item-view/depth-layout.h
@@
-21,6
+21,8
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
+
+
namespace Dali
{
namespace Dali
{
@@
-52,6
+54,12
@@
public:
virtual ~DepthLayout();
/**
virtual ~DepthLayout();
/**
+ * Apply depth layout Properties.
+ * @param[in] properties The properties of the layout.
+ */
+ void SetDepthLayoutProperties(const Property::Map& properties);
+
+ /**
* Set the number of columns in the layout.
* @param[in] columns The number of columns.
*/
* Set the number of columns in the layout.
* @param[in] columns The number of columns.
*/
@@
-156,7
+164,7
@@
public:
/**
* @copydoc ItemLayout::GetNextFocusItemID()
*/
/**
* @copydoc ItemLayout::GetNextFocusItemID()
*/
- virtual int GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus
Navigation
Direction direction, bool loopEnabled);
+ virtual int GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus
::
Direction direction, bool loopEnabled);
private:
private:
@@
-191,11
+199,6
@@
private:
virtual void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const;
/**
virtual void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const;
/**
- * @copydoc ItemLayout::GetResizeAnimation()
- */
- virtual void GetResizeAnimation(Animation& animation, Actor actor, Vector3 size, float durationSeconds) const;
-
- /**
* @copydoc ItemLayout::GetScrollDirection()
*/
virtual Degree GetScrollDirection() const;
* @copydoc ItemLayout::GetScrollDirection()
*/
virtual Degree GetScrollDirection() const;
@@
-219,6
+222,14
@@
protected:
private:
private:
+ // Undefined
+ DepthLayout( const DepthLayout& depthLayout );
+
+ // Undefined
+ DepthLayout& operator=( const DepthLayout& depthLayout );
+
+private:
+
struct Impl;
Impl* mImpl;
};
struct Impl;
Impl* mImpl;
};