Size negotiation patch 3: Scope size negotiation enums

[platform/core/uifw/dali-core.git] / dali / public-api / actors / actor-enumerations.h

diff --git a/dali/public-api/actors/actor-enumerations.h b/dali/public-api/actors/actor-enumerations.h
index 444eb07..b088695 100644 (file)
--- a/dali/public-api/actors/actor-enumerations.h
+++ b/dali/public-api/actors/actor-enumerations.h
@@ -49,19 +49,28 @@ enum PositionInheritanceMode
 /**
  * @brief Dimensions for layout
  */
-enum Dimension
+namespace Dimension
+{
+enum Type
 {
   WIDTH  = 0x1,       ///< Width dimension
   HEIGHT = 0x2,       ///< Height dimension
 
-  DIMENSION_COUNT = 2,  ///< Number of dimensions - update this if adding new dimension
   ALL_DIMENSIONS = 0x3  ///< Mask to cover all flags
 };
 
+enum Meta
+{
+  DIMENSION_COUNT = 2  ///< Number of dimensions - update this if adding new dimension
+};
+}
+
 /**
  * @brief Size negotiation resize policies
  */
-enum ResizePolicy
+namespace ResizePolicy
+{
+enum Type
 {
   FIXED,                 ///< Size is fixed as set by SetSize
   USE_NATURAL_SIZE,      ///< Size is to use the actor's natural size
@@ -72,16 +81,20 @@ enum ResizePolicy
   DIMENSION_DEPENDENCY,  ///< One dimension is dependent on the other
   USE_ASSIGNED_SIZE      ///< The size will be assigned to the actor
 };
+}
 
 /**
  * @brief Policies to determine how an actor should resize itself when having its size set in size negotiation
  */
-enum SizeScalePolicy
+namespace SizeScalePolicy
+{
+enum Type
 {
   USE_SIZE_SET,                ///< Use the size that was set
   FIT_WITH_ASPECT_RATIO,       ///< Fit within the size set maintaining natural size aspect ratio
   FILL_WITH_ASPECT_RATIO       ///< Fill up the size set maintaining natural size aspect ratio. May exceed size bounds in one dimension.
 };
+}
 
 /**
  * @brief Different types of alignment.