Merge "Changes after TouchedSignal changes" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / visuals / visual-properties-devel.h

diff --git a/dali-toolkit/devel-api/visuals/visual-properties-devel.h b/dali-toolkit/devel-api/visuals/visual-properties-devel.h
index fd83765..8164c2b 100644 (file)
--- a/dali-toolkit/devel-api/visuals/visual-properties-devel.h
+++ b/dali-toolkit/devel-api/visuals/visual-properties-devel.h
@@ -80,6 +80,15 @@ enum Type
    * @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
@@ -90,8 +99,12 @@ enum Type
  */
 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
+  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.
 };
 
 /**