[3.0] Mark Clipping API as being part of the Tizen 3 version 55/87855/2
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 9 Sep 2016 13:52:35 +0000 (14:52 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 9 Sep 2016 16:43:00 +0000 (09:43 -0700)
Change-Id: I3c0be13ad6fdce174f539c7a0bc310226628c1ef
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
dali/public-api/actors/actor-enumerations.h
dali/public-api/actors/actor.h
dali/public-api/rendering/renderer.h

index 78b861d599e8cdf5e368e259653cc8df2a7f27f7..f82e8bd171a3bd158692d1f1d8d175be04425640 100644 (file)
@@ -137,14 +137,14 @@ namespace VerticalAlignment
 
 /**
  * @brief The ClippingMode describes how this Actors children will be clipped against it.
- * @SINCE_1_2.5
+ * @SINCE_1_2_5
  */
 namespace ClippingMode
 {
   enum Type
   {
-    DISABLED,                     ///< This Actor will not clip its children. @SINCE_1_2.5
-    CLIP_CHILDREN,                ///< This Actor will clip all children to within its boundaries (the actor will also be visible itself). @SINCE_1_2.5
+    DISABLED,                     ///< This Actor will not clip its children. @SINCE_1_2_5
+    CLIP_CHILDREN,                ///< This Actor will clip all children to within its boundaries (the actor will also be visible itself). @SINCE_1_2_5
   };
 }
 
index 4e9731b721c7342e18c10428e92fd3f4a75939ff..3c06e5303c46a1a4a258e860fa24ed15f13c31c9 100644 (file)
@@ -303,7 +303,7 @@ public:
       MINIMUM_SIZE,                                       ///< name "minimumSize",           type Vector2     @SINCE_1_0.0
       MAXIMUM_SIZE,                                       ///< name "maximumSize",           type Vector2     @SINCE_1_0.0
       INHERIT_POSITION,                                   ///< name "inheritPosition",       type bool        @SINCE_1_1.24
-      CLIPPING_MODE,                                      ///< name "clippingMode",          type String      @SINCE_1_2.5
+      CLIPPING_MODE,                                      ///< name "clippingMode",          type String      @SINCE_1_2_5
     };
   };
 
index 2d0d02faf2c1682802a36b5c8b42c899f7c3db24..ff4a38f593ef76574988984f871814e1346f01d3 100644 (file)
@@ -167,15 +167,15 @@ namespace RenderMode
 
 /**
  * @brief Controls how this renderer uses its stencil properties and writes to the color buffer.
- * @SINCE_1_2.5
+ * @SINCE_1_2_5
  */
 enum Type
 {
-  NONE,         ///< Don’t write to either color or stencil buffer (But will potentially render to depth buffer). @SINCE_1_2.5
-  AUTO,         ///< Managed by the Actor Clipping API. This is the default.                                      @SINCE_1_2.5
-  COLOR,        ///< Ingore stencil properties.  Write to the color buffer.                                       @SINCE_1_2.5
-  STENCIL,      ///< Use the stencil properties. Do not write to the color buffer.                                @SINCE_1_2.5
-  COLOR_STENCIL ///< Use the stencil properties AND Write to the color buffer.                                    @SINCE_1_2.5
+  NONE,         ///< Don’t write to either color or stencil buffer (But will potentially render to depth buffer). @SINCE_1_2_5
+  AUTO,         ///< Managed by the Actor Clipping API. This is the default.                                      @SINCE_1_2_5
+  COLOR,        ///< Ingore stencil properties.  Write to the color buffer.                                       @SINCE_1_2_5
+  STENCIL,      ///< Use the stencil properties. Do not write to the color buffer.                                @SINCE_1_2_5
+  COLOR_STENCIL ///< Use the stencil properties AND Write to the color buffer.                                    @SINCE_1_2_5
 };
 
 } // namespace RenderMode
@@ -358,7 +358,7 @@ public:
        * @brief name "renderMode", type INTEGER
        * @see RenderMode
        * @note The default value is RenderMode::AUTO
-       * @SINCE_1_2.5
+       * @SINCE_1_2_5
        */
       RENDER_MODE,