Merge "Apply the new doxygen tagging rule for @SINCE" into devel/master

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

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h
index 9faba35..c5fd689 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_SCROLL_VIEW_CONSTRAINTS_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -19,8 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-
-// INTERNAL INCLUDES
+#include <dali/public-api/animation/constraint.h>
 
 namespace Dali
 {
@@ -32,6 +31,10 @@ class PropertyInput;
 
 namespace Toolkit
 {
+/**
+ * @addtogroup dali_toolkit_controls_scroll_view
+ * @{
+ */
 
 // Constraints ////////////////////////////////////////////////////////////////////////////////////
 
@@ -40,26 +43,24 @@ namespace Toolkit
  */
 
 /**
- * Move Actor constraint.
+ * @brief Move Actor constraint.
  *
  * Moves an Actor in accordance to scroll position.
+ * @SINCE_1_0.0
  */
-DALI_IMPORT_API Vector3 MoveActorConstraint(const Vector3&    current,
-                                           const PropertyInput& scrollPositionProperty);
+DALI_IMPORT_API void MoveActorConstraint( Vector3& current, const PropertyInputContainer& inputs );
 
 /**
- * Wrap Actor constraint.
+ * @brief Wrap Actor constraint.
  *
  * Wraps an Actors position in accordance to min/max bounds of domain.
+ * @SINCE_1_0.0
  */
-DALI_IMPORT_API Vector3 WrapActorConstraint(const Vector3&    current,
-                                            const PropertyInput& actorScaleProperty,
-                                            const PropertyInput& actorAnchorPointProperty,
-                                            const PropertyInput& actorSizeProperty,
-                                            const PropertyInput& scrollPositionMin,
-                                            const PropertyInput& scrollPositionMax,
-                                            const PropertyInput& scrollWrap);
+DALI_IMPORT_API void WrapActorConstraint( Vector3& position, const PropertyInputContainer& inputs );
 
+/**
+ * @}
+ */
 } // namespace Toolkit
 
 } // namespace Dali