From d36ee4803e53d38befcb77f15609107d940ee532 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Fri, 9 Sep 2016 14:52:35 +0100 Subject: [PATCH] Mark Clipping API as being part of the Tizen 3 version Change-Id: I3c0be13ad6fdce174f539c7a0bc310226628c1ef --- dali/public-api/actors/actor-enumerations.h | 6 +++--- dali/public-api/actors/actor.h | 2 +- dali/public-api/rendering/renderer.h | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) 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 7ba4260..79344e5 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 BATCH_PARENT, ///< name "batchParent", type bool @SINCE_1_2.0 }; }; diff --git a/dali/public-api/rendering/renderer.h b/dali/public-api/rendering/renderer.h index d654614..ad4cc74 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, -- 2.7.4