From: Adeel Kazmi Date: Fri, 9 Sep 2016 13:52:35 +0000 (+0100) Subject: [3.0] Mark Clipping API as being part of the Tizen 3 version X-Git-Tag: accepted/tizen/3.0/ivi/20161011.043719~2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-core.git;a=commitdiff_plain;h=334442ab65c242cf6da1435749a5c5c5bb69f592 [3.0] Mark Clipping API as being part of the Tizen 3 version Change-Id: I3c0be13ad6fdce174f539c7a0bc310226628c1ef Signed-off-by: Adeel Kazmi --- diff --git a/dali/public-api/actors/actor-enumerations.h b/dali/public-api/actors/actor-enumerations.h index 78b861d..f82e8bd 100644 --- a/dali/public-api/actors/actor-enumerations.h +++ b/dali/public-api/actors/actor-enumerations.h @@ -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 }; } diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h index 4e9731b..3c06e53 100644 --- a/dali/public-api/actors/actor.h +++ b/dali/public-api/actors/actor.h @@ -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 }; }; diff --git a/dali/public-api/rendering/renderer.h b/dali/public-api/rendering/renderer.h index 2d0d02f..ff4a38f 100644 --- a/dali/public-api/rendering/renderer.h +++ b/dali/public-api/rendering/renderer.h @@ -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,