JavaScript binding for ItemView

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / scrollable / scrollable.h

diff --git a/dali-toolkit/public-api/controls/scrollable/scrollable.h b/dali-toolkit/public-api/controls/scrollable/scrollable.h
index a7fd42b..3c22468 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/scrollable.h
+++ b/dali-toolkit/public-api/controls/scrollable/scrollable.h
@@ -43,11 +43,11 @@ class Scrollable;
  * Scrollables such as ScrollView and ItemView can be derived from this class.
  *
  * Signals
- * | %Signal Name      | Method                       |
- * |-------------------|------------------------------|
- * | scroll-started    | @ref ScrollStartedSignal()   |
- * | scroll-completed  | @ref ScrollUpdatedSignal()   |
- * | scroll-updated    | @ref ScrollCompletedSignal() |
+ * | %Signal Name     | Method                       |
+ * |------------------|------------------------------|
+ * | scrollStarted    | @ref ScrollStartedSignal()   |
+ * | scrollCompleted  | @ref ScrollUpdatedSignal()   |
+ * | scrollUpdated    | @ref ScrollCompletedSignal() |
  */
 class DALI_IMPORT_API Scrollable : public Control
 {
@@ -58,8 +58,8 @@ public:
    */
   enum PropertyRange
   {
-    PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
-    PROPERTY_END_INDEX =   PROPERTY_START_INDEX + 1000,             ///< Reserve property indices
+    PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, ///< @since DALi 1.1.18
+    PROPERTY_END_INDEX =   PROPERTY_START_INDEX + 1000,             ///< Reserve property indices, @since DALi 1.1.18
 
     ANIMATABLE_PROPERTY_START_INDEX = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX,
     ANIMATABLE_PROPERTY_END_INDEX =   ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000              ///< Reserve animatable property indices
@@ -73,19 +73,20 @@ public:
     enum
     {
       // Event side properties
-      OVERSHOOT_EFFECT_COLOR = PROPERTY_START_INDEX, ///< Property, name "overshoot-effect-color",    @see SetOvershootEffectColor(),    type Vector4
-      OVERSHOOT_ANIMATION_SPEED,                     ///< Property, name "overshoot-animation-speed", @see SetOvershootAnimationSpeed(), type float
+      OVERSHOOT_EFFECT_COLOR = PROPERTY_START_INDEX, ///< Property, name "overshootEffectColor",      @see SetOvershootEffectColor(),    type Vector4
+      OVERSHOOT_ANIMATION_SPEED,                     ///< Property, name "overshootAnimationSpeed",   @see SetOvershootAnimationSpeed(), type float
+      OVERSHOOT_ENABLED,                             ///< Property, name "overshootEnabled",          @see SetOvershootEnabled(),        type bool,    @since DALi 1.1.18
 
       // Animatable properties
-      SCROLL_RELATIVE_POSITION = ANIMATABLE_PROPERTY_START_INDEX, ///< Property, name "scroll-relative-position", type Vector2
-      SCROLL_POSITION_MIN,                                        ///< Property, name "scroll-position-min",      type Vector2
-      SCROLL_POSITION_MIN_X,                                      ///< Property, name "scroll-position-min-x",    type float
-      SCROLL_POSITION_MIN_Y,                                      ///< Property, name "scroll-position-min-y",    type float
-      SCROLL_POSITION_MAX,                                        ///< Property, name "scroll-position-max",      type Vector2
-      SCROLL_POSITION_MAX_X,                                      ///< Property, name "scroll-position-max-x",    type float
-      SCROLL_POSITION_MAX_Y,                                      ///< Property, name "scroll-position-max-y",    type float
-      CAN_SCROLL_VERTICAL,                                        ///< Property, name "can-scroll-vertical",      type bool
-      CAN_SCROLL_HORIZONTAL                                       ///< Property, name "can-scroll-horizontal",    type bool
+      SCROLL_RELATIVE_POSITION = ANIMATABLE_PROPERTY_START_INDEX, ///< Property, name "scrollRelativePosition",   type Vector2
+      SCROLL_POSITION_MIN,                                        ///< Property, name "scrollPositionMin",        type Vector2
+      SCROLL_POSITION_MIN_X,                                      ///< Property, name "scrollPositionMinX",       type float
+      SCROLL_POSITION_MIN_Y,                                      ///< Property, name "scrollPositionMinY",       type float
+      SCROLL_POSITION_MAX,                                        ///< Property, name "scrollPositionMax",        type Vector2
+      SCROLL_POSITION_MAX_X,                                      ///< Property, name "scrollPositionMaxX",       type float
+      SCROLL_POSITION_MAX_Y,                                      ///< Property, name "scrollPositionMaxY",       type float
+      CAN_SCROLL_VERTICAL,                                        ///< Property, name "canScrollVertical",        type bool
+      CAN_SCROLL_HORIZONTAL                                       ///< Property, name "canScrollHorizontal",      type bool
     };
   };