X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fitem-view%2Fitem-layout.h;h=e81c787db81aef119fc0ee156a4ba8da83205202;hp=51f051afa9244385e8170865f0dbdb094ab13c92;hb=14cbc07153dd2968bca80136e5b00bf47b32b98b;hpb=bea7b708b28cb38349ff99c3a656d40c065a8c54 diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h old mode 100644 new mode 100755 index 51f051a..e81c787 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_ITEM_LAYOUT_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -20,6 +20,8 @@ // EXTERNAL INCLUDES #include +#include +#include // INTERNAL INCLUDES #include @@ -37,18 +39,20 @@ namespace Toolkit class ItemLayout; -typedef IntrusivePtr ItemLayoutPtr; ///< Pointer to a Dali::Toolkit::ItemLayout object +typedef IntrusivePtr ItemLayoutPtr; ///< Pointer to a Dali::Toolkit::ItemLayout object @SINCE_1_0.0 /** * @brief A support class for managing ranges of items. + * @SINCE_1_0.0 */ struct ItemRange { /** - * @brief Create a range of item identifiers. + * @brief Creates a range of item identifiers. * - * @param[in] beginItem The first item within the range. - * @param[in] endItem The past-the-end item. + * @SINCE_1_0.0 + * @param[in] beginItem The first item within the range + * @param[in] endItem The past-the-end item */ ItemRange(unsigned int beginItem, unsigned int endItem) : begin(beginItem), @@ -59,7 +63,8 @@ struct ItemRange /** * @brief Copy Constructor. * - * @param[in] copy ItemRange we should copy from. + * @SINCE_1_0.0 + * @param[in] copy ItemRange we should copy from */ ItemRange(const ItemRange& copy) : begin(copy.begin), @@ -70,21 +75,26 @@ struct ItemRange /** * @brief Assignment operator. * - * @param[in] range The Range to assign from. - * @return The updated range. + * @SINCE_1_0.0 + * @param[in] range The Range to assign from + * @return The updated range */ ItemRange& operator=(const ItemRange& range) { - begin = range.begin; - end = range.end; + if( this != &range ) + { + begin = range.begin; + end = range.end; + } return *this; } /** - * @brief Test whether an item is within the range. + * @brief Tests whether an item is within the range. * - * @param[in] itemId The item identifier. - * @return True if the item is within the range. + * @SINCE_1_0.0 + * @param[in] itemId The item identifier + * @return true if the item is within the range */ bool Within(unsigned int itemId) { @@ -93,10 +103,11 @@ struct ItemRange } /** - * @brief Create the intersection of two ranges. + * @brief Creates the intersection of two ranges. * - * @param[in] second The second range. - * @return The intersection. + * @SINCE_1_0.0 + * @param[in] second The second range + * @return The intersection */ ItemRange Intersection(const ItemRange& second) { @@ -125,6 +136,7 @@ struct ItemRange * * An ItemLayout also describes the direction of input gestures, used to scroll through the layout. * Whilst scrolling, the layout provides a range of items that are within a layout-area (3D bounding volume). + * @SINCE_1_0.0 */ class DALI_IMPORT_API ItemLayout : public RefObject { @@ -134,12 +146,14 @@ public: /** * @brief Virtual destructor. + * @SINCE_1_0.0 */ DALI_IMPORT_API virtual ~ItemLayout(); /** * @brief Set the orientation of the layout. * + * @SINCE_1_0.0 * @param[in] orientation The orientation of the layout. */ DALI_IMPORT_API void SetOrientation(ControlOrientation::Type orientation); @@ -147,26 +161,43 @@ public: /** * @brief Query the orientation of the layout. * + * @SINCE_1_0.0 * @return the orientation of the layout. */ DALI_IMPORT_API ControlOrientation::Type GetOrientation() const; /** + * @brief Apply the layout Properties. + * @SINCE_1_2.20 + * @param[in] properties The properties the layout. + */ + void SetLayoutProperties(const Property::Map& properties); + + /** + * @brief Get the layout Properties. + * @SINCE_1_2.20 + * @return the property of the layout. + */ + Property::Map GetLayoutProperties(); + + /** * @brief Retrieve the target size of an item in the layout. * * This will return the default size for the layout unless overridden by calling SetItemSize(). * - * @note layout-position is not provided as a parameter, since applying size constraints is not recommended. - * Animating to target-sizes is preferable, since this allows controls to perform layouting without constraints. + * @SINCE_1_0.0 * @param[in] itemId The ID of an item in the layout. * @param[in] layoutSize The layout size * @param[out] itemSize The target size of an item. + * @note layout-position is not provided as a parameter, since applying size constraints is not recommended. + * Animating to target-sizes is preferable, since this allows controls to perform layouting without constraints. */ DALI_IMPORT_API void GetItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const; /** * @brief Overrides the default size for the layout. * + * @SINCE_1_0.0 * @param[in] itemSize The size of each item. */ DALI_IMPORT_API void SetItemSize( const Vector3& itemSize ); @@ -175,6 +206,7 @@ public: * @brief Query the minimum valid layout position; this is a negative value. * * When scrolling, the first item will move within the range 0 to GetMinimumLayoutPosition(). + * @SINCE_1_0.0 * @param[in] numberOfItems The current number of items in the layout. * @param[in] layoutSize The size of the layout area. * @return The minimum layout position. @@ -186,6 +218,7 @@ public: * * This anchor position is the position where all the items in the layout are aligned to * their rounded layout positions in integer. + * @SINCE_1_0.0 * @param[in] layoutPosition The layout position. * @return The closest anchor position for the given layout position. */ @@ -195,6 +228,7 @@ public: * @brief Query the layout position for the first item in the layout to move to when the layout * needs to scroll to a particular item. * + * @SINCE_1_0.0 * @param[in] itemId The ID of an item in the layout. * @return The layout position for the first item in the layout to move to. */ @@ -203,6 +237,7 @@ public: /** * @brief Query the items within a given layout-area. * + * @SINCE_1_0.0 * @param[in] firstItemPosition The layout-position of the first item in the layout. * @param[in] layoutSize The size of the layout area. * @return The ID of the first & last visible item. @@ -220,6 +255,7 @@ public: * implementations should provide their own version of this function * to ensure proper functionality of internal toolkit systems. * + * @SINCE_1_0.0 * @param[in] itemID id of the item to bring within the viewable screen area * @param[in] currentLayoutPosition the current layout position of the item view instance * @param[in] layoutSize the current size of the item view instance @@ -230,6 +266,7 @@ public: /** * @brief Query the number of items that should be reserved, for scrolling purposes. * + * @SINCE_1_0.0 * @param[in] layoutSize The size of the layout area. * @return The number of extra items. ItemView will populate itself with actors within the layout-area * (see GetItemsWithinArea), plus this number of additional items on either-side. @@ -239,11 +276,12 @@ public: /** * @brief Retrieve the default size of an item in the layout. * - * @note layout-position is not provided as a parameter, since applying size constraints is not recommended. - * Animating to target-sizes is preferable, since this allows controls to perform layouting without constraints. + * @SINCE_1_0.0 * @param[in] itemId The ID of an item in the layout. * @param[in] layoutSize The layout size * @param[out] itemSize The target size of an item. + * @note layout-position is not provided as a parameter, since applying size constraints is not recommended. + * Animating to target-sizes is preferable, since this allows controls to perform layouting without constraints. */ virtual void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const = 0; @@ -252,6 +290,7 @@ public: * * When an input gesture follows this direction, the layout-position of items will be increased. * If the input gesture points in the opposite direction, then the layout-positions will decrease. + * @SINCE_1_0.0 * @return The scroll direction in degrees. */ virtual Degree GetScrollDirection() const = 0; @@ -266,6 +305,7 @@ public: * position of actors will be moved by 1. * Therefore, the bigger the factor is, the faster the scroll speed will be. * + * @SINCE_1_0.0 * @return The scroll speed factor of the layout. */ virtual float GetScrollSpeedFactor() const = 0; @@ -274,6 +314,7 @@ public: * @brief Query the maximum swipe speed in pixels per second. * * Swipe gestures will be clamped when exceeding this speed limit. + * @SINCE_1_0.0 * @return speed The maximum swipe speed. */ virtual float GetMaximumSwipeSpeed() const = 0; @@ -284,6 +325,7 @@ public: * This is the time taken to animate each * item to its next layout position (e.g. from 1.0 to 2.0) when a flick animation is triggered * by a swipe gesture. + * @SINCE_1_0.0 * @return The duration of the flick animation. */ virtual float GetItemFlickAnimationDuration() const = 0; @@ -291,6 +333,7 @@ public: /** * @brief Gets the id of the next item for KeyboardFocusManager to focus on depending on the inputted item ID. * + * @SINCE_1_0.0 * @param[in] itemID The current focused item * @param[in] maxItems The maximum number of items in the list * @param[in] direction The directional key pressed on the keyboard @@ -309,16 +352,17 @@ public: * position of actors will be moved by 1. * Therefore, the bigger the factor is, the faster the flick speed will be. * + * @SINCE_1_0.0 * @return The scroll speed factor of the layout. */ DALI_IMPORT_API virtual float GetFlickSpeedFactor() const; - /* + /** * @brief Applies constraints defined by the layout to an actor. * * @param[in] actor The actor to constrain. * @param[in] itemId The ID of the item represented by the actor. - * @param[in] layoutSize the current size of the item view instance. + * @param[in] layoutSize The current size of the item view instance. * @param[in] itemViewActor The item view instance which requests the application of constraints. */ DALI_IMPORT_API virtual void ApplyConstraints( Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor ) = 0; @@ -326,16 +370,18 @@ public: /** * @brief Gets the position of a given item * - * @param[in] itemID id of the item we want to get its position - * @param[in] currentLayoutPosition the current layout position of the item view instance - * @param[in] layoutSize the current size of the item view instance + * @SINCE_1_0.0 + * @param[in] itemID The id of the item we want to get its position + * @param[in] currentLayoutPosition The current layout position of the item view instance + * @param[in] layoutSize The current size of the item view instance * @return The item position (x,y,z) */ DALI_IMPORT_API virtual Vector3 GetItemPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) const = 0; /** - * Retrieve the extension for this layout. + * @brief Retrieve the extension for this layout. * + * @SINCE_1_0.0 * @return The extension if available, NULL otherwise */ virtual Extension* GetExtension() @@ -347,18 +393,21 @@ protected: /** * @brief Create a new ItemLayout; Only derived versions are instantiatable. + * @SINCE_1_0.0 */ DALI_IMPORT_API ItemLayout(); private: /** - * Don't allow copy constructor + * @brief Don't allow copy constructor + * @SINCE_1_0.0 */ ItemLayout( const ItemLayout& handle ); /** - * Don't allow copy operator + * @brief Don't allow copy operator + * @SINCE_1_0.0 */ ItemLayout& operator=( const ItemLayout& handle );