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
Size negotiation patch 3: Scope size negotiation enums
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
table-view
/
table-view-impl.h
diff --git
a/dali-toolkit/internal/controls/table-view/table-view-impl.h
b/dali-toolkit/internal/controls/table-view/table-view-impl.h
index
55a7d7b
..
be41e47
100644
(file)
--- a/
dali-toolkit/internal/controls/table-view/table-view-impl.h
+++ b/
dali-toolkit/internal/controls/table-view/table-view-impl.h
@@
-251,7
+251,7
@@
private: // From Control
/**
* @copydoc Control::CalculateChildSize
*/
/**
* @copydoc Control::CalculateChildSize
*/
- virtual float CalculateChildSize( const Actor& child, Dimension dimension );
+ virtual float CalculateChildSize( const Actor& child, Dimension
::Type
dimension );
/**
* @copydoc Control::OnInitialize()
/**
* @copydoc Control::OnInitialize()
@@
-271,17
+271,17
@@
private: // From Control
/**
* @copydoc Control::RelayoutDependentOnChildren()
*/
/**
* @copydoc Control::RelayoutDependentOnChildren()
*/
- virtual bool RelayoutDependentOnChildren( Dimension
dimension =
ALL_DIMENSIONS );
+ virtual bool RelayoutDependentOnChildren( Dimension
::Type dimension = Dimension::
ALL_DIMENSIONS );
/**
* @copydoc Control::OnCalculateRelayoutSize
*/
/**
* @copydoc Control::OnCalculateRelayoutSize
*/
- virtual void OnCalculateRelayoutSize( Dimension dimension );
+ virtual void OnCalculateRelayoutSize( Dimension
::Type
dimension );
/**
* @copydoc Control::OnLayoutNegotiated
*/
/**
* @copydoc Control::OnLayoutNegotiated
*/
- virtual void OnLayoutNegotiated( float size, Dimension dimension );
+ virtual void OnLayoutNegotiated( float size, Dimension
::Type
dimension );
private: // Implementation
private: // Implementation
@@
-404,9
+404,9
@@
private:
* @brief Calculate the fixed sizes for a row or column
*
* @param[in] data The row or column data to process
* @brief Calculate the fixed sizes for a row or column
*
* @param[in] data The row or column data to process
- * @param[in] dimension The dimension being calculated: row ==
HEIGHT, column ==
WIDTH
+ * @param[in] dimension The dimension being calculated: row ==
Dimension::HEIGHT, column == Dimension::
WIDTH
*/
*/
- void CalculateFixedSizes( RowColumnArray& data, Dimension dimension );
+ void CalculateFixedSizes( RowColumnArray& data, Dimension
::Type
dimension );
/**
* @brief Calculate the value of the relative sizes
/**
* @brief Calculate the value of the relative sizes
@@
-430,6
+430,14
@@
private:
void CalculateRowColumnData();
/**
void CalculateRowColumnData();
/**
+ * @brief Return the cell padding for a given dimension
+ *
+ * @param[in] dimension The dimension to return the padding for
+ * @return Return the padding (x = low, y = high)
+ */
+ Vector2 GetCellPadding( Dimension::Type dimension );
+
+ /**
* A reference counted object may only be deleted by calling Unreference()
*/
virtual ~TableView();
* A reference counted object may only be deleted by calling Unreference()
*/
virtual ~TableView();