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_1.9.14] Merge branch '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
old mode 100644
(file)
new mode 100755
(executable)
index
b2b3bd9
..
915e8a6
--- 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) 201
5
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.
@@
-22,6
+22,9
@@
#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
{
@@
-53,6
+56,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.
@@
-234,11
+243,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;
@@
-262,6
+266,14
@@
protected:
private:
private:
+ // Undefined
+ GridLayout( const GridLayout& itemLayout );
+
+ // Undefined
+ GridLayout& operator=( const GridLayout& rhs );
+
+private:
+
struct Impl;
Impl* mImpl;
};
struct Impl;
Impl* mImpl;
};
@@
-272,4
+284,4
@@
private:
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_GRID_LAYOUT_H__
+#endif //
DALI_TOOLKIT_GRID_LAYOUT_H