Remove flexPadding and flexBorder as DALi does not support box model

Change-Id: If4f7e9c241f288e1cf4cd23fcb88393ce7dd86bb

diff --git a/dali-toolkit/devel-api/controls/flex-container/flex-container.h b/dali-toolkit/devel-api/controls/flex-container/flex-container.h
index 97a9bdb..154eedd 100644 (file)
--- a/dali-toolkit/devel-api/controls/flex-container/flex-container.h
+++ b/dali-toolkit/devel-api/controls/flex-container/flex-container.h
@@ -84,8 +84,6 @@ class FlexContainer;
  * |-------------------------|-------------|
  * | flex                    | float       |
  * | alignSelf               | integer     |
- * | flexPadding             | Vector4     |
- * | flexBorder              | Vector4     |
  * | flexMargin              | Vector4     |
  *
  * The available values for alignSelf are: ALIGN_AUTO, ALIGN_FLEX_START, ALIGN_CENTER, ALIGN_FLEX_END, ALIGN_STRETCH
@@ -97,9 +95,7 @@ class FlexContainer;
  *   "customProperties": {
  *     "flex":1,                        // property to make the item to receive the specified proportion of the free space in the container. If all items in the container use this pattern, their sizes will be proportional to the specified flex factor.
  *     "alignSelf":"flexStart",         // property to specify how the item will align along the cross axis, if set, this overides the default alignment for all items in the container
- *     "flexPadding":[10, 10, 10, 10],  // property to specify the space around the content (inside the flex border) of the item, if not set, default value is [0, 0, 0, 0]
- *     "flexBorder":[5, 5, 5, 5],       // property to specify the border that goes around the flex padding and the content of the item, if not set, default value is [0, 0, 0, 0]
- *     "flexMargin":[10, 10, 10, 10]    // property to specify the space outside the flex border, if not set, default value is [0, 0, 0, 0]
+ *     "flexMargin":[10, 10, 10, 10]    // property to specify the space around the item, if not set, default value is [0, 0, 0, 0]
  *   }
  * @endcode
  */

diff --git a/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp b/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp
index 323a2cd..00e1271 100644 (file)
--- a/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp
+++ b/dali-toolkit/internal/controls/flex-container/flex-container-impl.cpp
@@ -42,8 +42,6 @@ namespace
  */
 const char * const FLEX_PROPERTY_NAME("flex");
 const char * const ALIGN_SELF_PROPERTY_NAME("alignSelf");
-const char * const FLEX_PADDING_PROPERTY_NAME("flexPadding");
-const char * const FLEX_BORDER_PROPERTY_NAME("flexBorder");
 const char * const FLEX_MARGIN_PROPERTY_NAME("flexMargin");
 
 #if defined(DEBUG_ENABLED)
@@ -634,24 +632,6 @@ void FlexContainer::ComputeLayout()
         childNode->style.align_self = static_cast<css_align_t>(alignSelf);
       }
 
-      if( childActor.GetPropertyIndex( FLEX_PADDING_PROPERTY_NAME ) != Property::INVALID_INDEX )
-      {
-        Vector4 flexPadding = childActor.GetProperty( childActor.GetPropertyIndex(FLEX_PADDING_PROPERTY_NAME) ).Get<Vector4>();
-        childNode->style.padding[CSS_LEFT] = flexPadding.x;
-        childNode->style.padding[CSS_TOP] = flexPadding.y;
-        childNode->style.padding[CSS_RIGHT] = flexPadding.z;
-        childNode->style.padding[CSS_BOTTOM] = flexPadding.w;
-      }
-
-      if( childActor.GetPropertyIndex( FLEX_BORDER_PROPERTY_NAME ) != Property::INVALID_INDEX )
-      {
-        Vector4 flexBorder = childActor.GetProperty( childActor.GetPropertyIndex(FLEX_BORDER_PROPERTY_NAME) ).Get<Vector4>();
-        childNode->style.border[CSS_LEFT] = flexBorder.x;
-        childNode->style.border[CSS_TOP] = flexBorder.y;
-        childNode->style.border[CSS_RIGHT] = flexBorder.z;
-        childNode->style.border[CSS_BOTTOM] = flexBorder.w;
-      }
-
       if( childActor.GetPropertyIndex( FLEX_MARGIN_PROPERTY_NAME ) != Property::INVALID_INDEX )
       {
         Vector4 flexMargin = childActor.GetProperty( childActor.GetPropertyIndex(FLEX_MARGIN_PROPERTY_NAME) ).Get<Vector4>();