[dali_2.0.28] Merge branch 'devel/master'

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

diff --git a/dali-toolkit/devel-api/visuals/color-visual-properties-devel.h b/dali-toolkit/devel-api/visuals/color-visual-properties-devel.h
index 654b290..bae7111 100644 (file)
--- a/dali-toolkit/devel-api/visuals/color-visual-properties-devel.h
+++ b/dali-toolkit/devel-api/visuals/color-visual-properties-devel.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_COLOR_VISUAL_PROPERTIES_DEVEL_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,20 +23,15 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
-
 namespace DevelColorVisual
 {
-
 /**
  * @brief Additional ColorVisual Properties.
  */
 namespace Property
 {
-
 /**
  * @brief Enumeration for the instance of additional properties belonging to the ColorVisual.
  */
@@ -45,16 +40,8 @@ enum
   MIX_COLOR = Toolkit::ColorVisual::Property::MIX_COLOR,
 
   /**
-   * @brief Whether to render if the MIX_COLOR is transparent.
-   * @details Name "renderIfTransparent", type Property::BOOLEAN.
-   * @note Optional.
-   * @note By default it's false, i.e. ColorVisual will not render if the MIX_COLOR is transparent.
-   */
-  RENDER_IF_TRANSPARENT = MIX_COLOR + 1,
-
-  /**
    * @brief The blur radius of the visual.
-   * @details Name "blurRadius", type Property::FLOAT.
+   * @details Name "blurRadius", type Property::FLOAT, animatable.
    *          If the value is 0, the edge is sharp. Otherwise, the larger the value, the more the edge is blurred.
    * @note Optional.
    * @note The default is 0.
@@ -65,11 +52,7 @@ enum
 
 } // namespace Property
 
-} // namespace ColorVisual
-
-/**
- * @}
- */
+} // namespace DevelColorVisual
 
 } // namespace Toolkit