Merge "Use new animatable registered properties in ScrollView" into tizen

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

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp
index ac29e53..48b21f1 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // INTERNAL INCLUDES
 
@@ -35,19 +36,6 @@ Vector3 MoveActorConstraint(const Vector3&    current,
   return current + scrollPositionProperty.GetVector3();
 }
 
-Vector3 MoveScaledActorConstraint(const Vector3&    current,
-                                  const PropertyInput& scrollPositionProperty,
-                                  const PropertyInput& scrollScaleProperty)
-{
-  return scrollScaleProperty.GetVector3() * (current + scrollPositionProperty.GetVector3());
-}
-
-Vector3 ScaleActorConstraint(const Vector3&    current,
-                             const PropertyInput& scrollScaleProperty)
-{
- return current * scrollScaleProperty.GetVector3();
-}
-
 Vector3 WrapActorConstraint(const Vector3&    current,
                             const PropertyInput& actorScaleProperty,
                             const PropertyInput& actorAnchorPointProperty,