X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fvisuals%2Fvisual-properties-devel.h;h=6a5f51d75b99130c85de6bab20c467fc5c4a0476;hb=798ef5fa1591aa78851e9e3d08fe37411192176a;hp=e30f241c7b7987882593e5a89050b3f7c27ce02f;hpb=7cfada64ad44d4a47785d49993b298f1c2dbd4a0;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/visuals/visual-properties-devel.h b/dali-toolkit/devel-api/visuals/visual-properties-devel.h index e30f241..6a5f51d 100644 --- a/dali-toolkit/devel-api/visuals/visual-properties-devel.h +++ b/dali-toolkit/devel-api/visuals/visual-properties-devel.h @@ -23,13 +23,10 @@ namespace Dali { - namespace Toolkit { - namespace DevelVisual { - /** * @brief All the visual types. */ @@ -47,9 +44,9 @@ enum Type SVG = Dali::Toolkit::Visual::SVG, ANIMATED_IMAGE = Dali::Toolkit::Visual::ANIMATED_IMAGE, - ANIMATED_GRADIENT = ANIMATED_IMAGE + 1, ///< Renders an animated gradient. - ANIMATED_VECTOR_IMAGE = ANIMATED_IMAGE + 2, ///< Renders an animated vector image. - ARC = ANIMATED_IMAGE + 3, ///< Renders an arc. + ANIMATED_GRADIENT = ANIMATED_IMAGE + 1, ///< Renders an animated gradient. + ANIMATED_VECTOR_IMAGE = ANIMATED_IMAGE + 2, ///< Renders an animated vector image. + ARC = ANIMATED_IMAGE + 3, ///< Renders an arc. }; /** @@ -76,26 +73,34 @@ enum Type /** * @brief The radius for the rounded corners of the visual - * @details Name "cornerRadius", type Property::FLOAT. + * @details Name "cornerRadius", type Property::FLOAT, animatable * @note Optional. */ CORNER_RADIUS = OPACITY + 2, + + /** + * @brief Whether the corner radius value is relative (percentage [0.0f to 1.0f] of the visual size) or absolute (in world units). + * @details Name "cornerRadiusPolicy", type Property::INTEGER. + * @see Policy::Type + * @note By default, it is ABSOLUTE to the visual's size. + * If it it RELATIVE, the corner radius value is relative to the smaller of the visual width and visual height. + */ + CORNER_RADIUS_POLICY = OPACITY + 3, }; } // namespace Property - /** * @brief The values of this enum determine how the visual should be fit to the view */ enum FittingMode { - FIT_KEEP_ASPECT_RATIO, ///< The visual should be scaled to fit, preserving aspect ratio - FILL, ///< The visual should be stretched to fill, not preserving aspect ratio - OVER_FIT_KEEP_ASPECT_RATIO,///< The visual should be scaled to fit, preserving aspect ratio. The visual will be filled without empty area, and outside is cropped away. - CENTER, ///< The visual should keep original size of image. It is not scaled and not strecthed. - FIT_HEIGHT, ///< The visual should be scaled to fit, preserving aspect ratio. Height is scaled proportionately to maintain aspect ratio. It will be deprecated. - FIT_WIDTH ///< The visual should be scaled to fit, preserving aspect ratio. Width is scaled proportionately to maintain aspect ratio. It will be deprecated. + FIT_KEEP_ASPECT_RATIO, ///< The visual should be scaled to fit, preserving aspect ratio + FILL, ///< The visual should be stretched to fill, not preserving aspect ratio + OVER_FIT_KEEP_ASPECT_RATIO, ///< The visual should be scaled to fit, preserving aspect ratio. The visual will be filled without empty area, and outside is cropped away. + CENTER, ///< The visual should keep original size of image. It is not scaled and not strecthed. + FIT_HEIGHT, ///< The visual should be scaled to fit, preserving aspect ratio. Height is scaled proportionately to maintain aspect ratio. It will be deprecated. + FIT_WIDTH ///< The visual should be scaled to fit, preserving aspect ratio. Width is scaled proportionately to maintain aspect ratio. It will be deprecated. }; /** @@ -103,13 +108,11 @@ enum FittingMode */ namespace Transform { - /** * @brief Visual Transform Property. */ namespace Property { - /** * @brief Enumeration for the type of Transform Property. */