Define Control's corner properties as animatable

Let we just make them as Animatable property, to make we use them
as input of constraint.

Change-Id: I2c03433095f75451186e8db946e7927b1bba75bc
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>

diff --git a/dali-toolkit/devel-api/controls/control-devel.h b/dali-toolkit/devel-api/controls/control-devel.h
index 6cbde7345750460427033268a1ce2bb270857438..264670850c839621fd5240b9afff25cd68bce594 100644 (file)
--- a/dali-toolkit/devel-api/controls/control-devel.h
+++ b/dali-toolkit/devel-api/controls/control-devel.h
@@ -272,7 +272,7 @@ enum
    * @note Applies to specific visuals inside the control.
    * @see Dali::Toolkit::DevelVisual::Property::Type::CORNER_RADIUS
    */
-  CORNER_RADIUS,
+  CORNER_RADIUS = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000,
 
   /**
    * @brief Whether the corner radius value is relative (percentage [0.0f to 0.5f] of the visual size) or absolute (in world units).

diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp
index 989997a47b84658ccb7fbbd1787a28b066911f3d..3a22b7269572493d801b166e46cb96f1a4132e58 100644 (file)
--- a/dali-toolkit/internal/controls/control/control-data-impl.cpp
+++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp
@@ -375,9 +375,10 @@ const PropertyRegistration Control::Impl::PROPERTY_28(typeRegistration, "accessi
 const PropertyRegistration Control::Impl::PROPERTY_29(typeRegistration, "accessibilityStates",            Toolkit::DevelControl::Property::ACCESSIBILITY_STATES,             Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
 const PropertyRegistration Control::Impl::PROPERTY_30(typeRegistration, "accessibilityIsModal",           Toolkit::DevelControl::Property::ACCESSIBILITY_IS_MODAL,           Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
 const PropertyRegistration Control::Impl::PROPERTY_31(typeRegistration, "offScreenRendering",             Toolkit::DevelControl::Property::OFFSCREEN_RENDERING,              Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
-const PropertyRegistration Control::Impl::PROPERTY_32(typeRegistration, "cornerRadius",                   Toolkit::DevelControl::Property::CORNER_RADIUS,                    Property::VECTOR4, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
-const PropertyRegistration Control::Impl::PROPERTY_33(typeRegistration, "cornerRadiusPolicy",             Toolkit::DevelControl::Property::CORNER_RADIUS_POLICY,             Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
-const PropertyRegistration Control::Impl::PROPERTY_34(typeRegistration, "cornerSquareness",               Toolkit::DevelControl::Property::CORNER_SQUARENESS,                Property::VECTOR4, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+
+const AnimatablePropertyRegistration Control::Impl::ANIMATABLE_PROPERTY_1(typeRegistration, "cornerRadius",       Toolkit::DevelControl::Property::CORNER_RADIUS,        Property::VECTOR4, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
+const AnimatablePropertyRegistration Control::Impl::ANIMATABLE_PROPERTY_2(typeRegistration, "cornerRadiusPolicy", Toolkit::DevelControl::Property::CORNER_RADIUS_POLICY, Property::INTEGER, &Control::Impl::SetProperty, &Control::Impl::GetProperty); ///< Make animatable, for constarint-input
+const AnimatablePropertyRegistration Control::Impl::ANIMATABLE_PROPERTY_3(typeRegistration, "cornerSquareness",   Toolkit::DevelControl::Property::CORNER_SQUARENESS,    Property::VECTOR4, &Control::Impl::SetProperty, &Control::Impl::GetProperty);
 
 // clang-format on
 

diff --git a/dali-toolkit/internal/controls/control/control-data-impl.h b/dali-toolkit/internal/controls/control/control-data-impl.h
index 4e7ccfb3df9bbc3976820dd2e59bf95417488d6d..a832860b2a1fe9203bce674724973be3d8543620 100644 (file)
--- a/dali-toolkit/internal/controls/control/control-data-impl.h
+++ b/dali-toolkit/internal/controls/control/control-data-impl.h
@@ -583,9 +583,10 @@ public:
   static const PropertyRegistration PROPERTY_29;
   static const PropertyRegistration PROPERTY_30;
   static const PropertyRegistration PROPERTY_31;
-  static const PropertyRegistration PROPERTY_32;
-  static const PropertyRegistration PROPERTY_33;
-  static const PropertyRegistration PROPERTY_34;
+
+  static const AnimatablePropertyRegistration ANIMATABLE_PROPERTY_1;
+  static const AnimatablePropertyRegistration ANIMATABLE_PROPERTY_2;
+  static const AnimatablePropertyRegistration ANIMATABLE_PROPERTY_3;
 };
 
 } // namespace Internal