X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Ftable-view%2Ftable-view.h;h=549a1455ad61cb42c3e17c638816349ecd1573b5;hp=1b4a332acd1cb59d436e4ef7222ece36e37a0dd5;hb=refs%2Ftags%2Fsubmit%2Ftizen%2F20150309.074330;hpb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2 diff --git a/dali-toolkit/public-api/controls/table-view/table-view.h b/dali-toolkit/public-api/controls/table-view/table-view.h index 1b4a332..549a145 100644 --- a/dali-toolkit/public-api/controls/table-view/table-view.h +++ b/dali-toolkit/public-api/controls/table-view/table-view.h @@ -45,15 +45,19 @@ class DALI_IMPORT_API TableView : public Control { public: - /// @name Properties - /** @{ */ - static const Property::Index PROPERTY_ROWS; ///< name "rows", type UNSIGNED_INTEGER - static const Property::Index PROPERTY_COLUMNS; ///< name "columns", type UNSIGNED_INTEGER - static const Property::Index PROPERTY_CELL_PADDING; ///< name "cell-padding", type VECTOR2 - static const Property::Index PROPERTY_LAYOUT_ANIMATION_DURATION; ///< name "layout-animation-duration", type FLOAT - - /* - * PROPERTY_LAYOUT_ROWS set the height of the rows + /** + * @brief The start and end property ranges for this control. + */ + enum PropertyRange + { + PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, + PROPERTY_END_INDEX = PROPERTY_START_INDEX + 1000 ///< Reserve property indices + }; + + /** + * @brief An enumeration of properties belonging to the TableView class. + * + * LayoutRows: set the height of the rows. * It has the format as follows in script: * @code * "layout-rows": @@ -62,11 +66,8 @@ public: "2": { "policy": "relative", "value": 0.33 } //@see SetRelativeHeight } * @endcode - */ - static const Property::Index PROPERTY_LAYOUT_ROWS; ///< name "layout-rows", type MAP - - /* - * PROPERTY_LAYOUT_COLUMNS set the height of the rows + * + * LayoutColumns: set the height of the rows. * It has the format as follows in script: * @code * "layout-columns": @@ -76,16 +77,23 @@ public: } * @endcode */ - static const Property::Index PROPERTY_LAYOUT_COLUMNS; ///< name "layout-columns", type MAP - /** @} */ - + struct Property + { + enum + { + ROWS = PROPERTY_START_INDEX, ///< name "rows", type UNSIGNED_INTEGER + COLUMNS, ///< name "columns", type UNSIGNED_INTEGER + CELL_PADDING, ///< name "cell-padding", type VECTOR2 + LAYOUT_ROWS, ///< name "layout-rows", type MAP + LAYOUT_COLUMNS, ///< name "layout-columns", type MAP + }; + }; // Custom properties for where to put the actor, these properties should be registered to the child which would be added to the table static const std::string CELL_INDICES_PROPERTY_NAME; ///< Property, name "cell-indices", type VECTOR2 static const std::string ROW_SPAN_PROPERTY_NAME; ///< Property, name "row-span", type FLOAT (Currently builder unable to differentiate integer and float from Json string) static const std::string COLUMN_SPAN_PROPERTY_NAME; ///< Property, name "column-span", type FLOAT (Currently builder unable to differentiate integer and float from Json string) - /** * @brief Describes how the size of a row / column been set */ @@ -333,19 +341,6 @@ public: float GetRelativeWidth( unsigned int columnIndex ) const; /** - * Sets the layout animation duration for add, remove and relayout - * @param duration for the layout animations - * @note The default duration is 0.0f. - */ - void SetLayoutAnimationDuration( float duration ); - - /** - * Gets the layout animation duration for add, remove and relayout - * @return duration for the layout animations - */ - float GetLayoutAnimationDuration(); - - /** * @return the amount of rows in the table */ unsigned int GetRows();