X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fscrollable-impl.h;h=e100e755afe65189092b83f61a49e05bf8d54727;hb=306d2f61a1b64179e801fa8a0bb2bd7b4e9dd682;hp=72cc47adc5bc4ad924105a08a8160fa82e07ca4c;hpb=f77f0cb417df66a09f468c974e14b881142cf15b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.h b/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
index 72cc47a..e100e75 100644
--- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
@@ -1,25 +1,27 @@
 #ifndef __DALI_TOOLKIT_INTERNAL_SCROLLABLE_H__
 #define __DALI_TOOLKIT_INTERNAL_SCROLLABLE_H__
 
-//
-// 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
-#include <dali/dali.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/map-wrapper.h>
 
+// INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h>
@@ -39,7 +41,7 @@ typedef IntrusivePtr<Scrollable> ScrollablePtr;
 /**
  * @copydoc Toolkit::Scrollable
  */
-class Scrollable : public ControlImpl
+class Scrollable : public Control
 {
 public:
   static const std::string SCROLLABLE_CAN_SCROLL_VERTICAL;
@@ -105,6 +107,28 @@ public:
    */
   virtual void ScrollTo(const Vector3 &position, float duration) = 0;
 
+  /**
+   * Set the color of the overshoot effect.
+   * @parm[in] color The color of the overshoot effect
+   */
+  virtual void SetOvershootEffectColor( const Vector4& color ) = 0;
+
+  /**
+   * Retrieve the color of the overshoot effect.
+   * @return The color of the overshoot effect.
+   */
+  Vector4 GetOvershootEffectColor() const;
+
+  /**
+   * @copydoc Dali::Toolkit::Scrollable::SetOvershootAnimationSpeed(float pixelsPerSecond)
+   */
+  void SetOvershootAnimationSpeed( float pixelsPerSecond );
+
+  /**
+   * @copydoc Dali::Toolkit::Scrollable::GetOvershootAnimationSpeed()
+   */
+  float GetOvershootAnimationSpeed() const;
+
 private:
 
   /**
@@ -119,22 +143,22 @@ public: //Signals
   /**
    * @copydoc Dali::Toolkit::Scrollable::ScrollStartedSignal()
    */
-  Toolkit::Scrollable::ScrollStartedSignalV2& ScrollStartedSignal();
+  Toolkit::Scrollable::ScrollStartedSignalType& ScrollStartedSignal();
 
   /**
    * @copydoc Dali::Toolkit::Scrollable::ScrollUpdatedSignal()
    */
-  Toolkit::Scrollable::ScrollUpdatedSignalV2& ScrollUpdatedSignal();
+  Toolkit::Scrollable::ScrollUpdatedSignalType& ScrollUpdatedSignal();
 
   /**
    * @copydoc Dali::Toolkit::Scrollable::ScrollCompletedSignal()
    */
-  Toolkit::Scrollable::ScrollCompletedSignalV2& ScrollCompletedSignal();
+  Toolkit::Scrollable::ScrollCompletedSignalType& ScrollCompletedSignal();
 
   /**
    * @copydoc Dali::Toolkit::Scrollable::ScrollClampedSignal()
    */
-  Toolkit::Scrollable::ScrollClampedSignalV2& ScrollClampedSignal();
+  Toolkit::Scrollable::ScrollClampedSignalType& ScrollClampedSignal();
 
   /**
    * Connects a callback function with the object's signals.
@@ -147,6 +171,24 @@ public: //Signals
    */
   static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor );
 
+  //properties
+
+  /**
+   * Called when a property of an object of this type is set.
+   * @param[in] object The object whose property is set.
+   * @param[in] index The property index.
+   * @param[in] value The new property value.
+   */
+  static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value );
+
+  /**
+   * Called to retrieve a property of an object of this type.
+   * @param[in] object The object whose property is to be retrieved.
+   * @param[in] index The property index.
+   * @return The current value of the property.
+   */
+  static Property::Value GetProperty( BaseObject* object, Property::Index index );
+
 protected:
 
   /**
@@ -191,6 +233,9 @@ private:
 
 protected:
 
+  Vector4         mOvershootEffectColor;    ///<The color of the overshoot bouncing effect
+  float           mOvershootAnimationSpeed; ///<The speed of the overshoot animation (pixels per second)
+
   Property::Index mPropertyRelativePosition;///< Scroll Relative Position ("scroll-relative-position") [range from 0.0f - 1.0f in each axes]
   Property::Index mPropertyPositionMin;     ///< Scroll Domain Minimum ("position-min")
   Property::Index mPropertyPositionMax;     ///< Scroll Domain Maximum ("position-max")
@@ -200,10 +245,10 @@ protected:
 
   std::map<Toolkit::Scrollable::ScrollComponentType, ScrollComponentPtr> mComponent;  ///< ScrollComponent (such as a scrollbar/page indicator/status)
 
-  Toolkit::Scrollable::ScrollStartedSignalV2 mScrollStartedSignalV2;
-  Toolkit::Scrollable::ScrollUpdatedSignalV2 mScrollUpdatedSignalV2;
-  Toolkit::Scrollable::ScrollCompletedSignalV2 mScrollCompletedSignalV2;
-  Toolkit::Scrollable::ScrollClampedSignalV2 mScrollClampedSignalV2;
+  Toolkit::Scrollable::ScrollStartedSignalType mScrollStartedSignal;
+  Toolkit::Scrollable::ScrollUpdatedSignalType mScrollUpdatedSignal;
+  Toolkit::Scrollable::ScrollCompletedSignalType mScrollCompletedSignal;
+  Toolkit::Scrollable::ScrollClampedSignalType mScrollClampedSignal;
 
 private:
 
@@ -211,7 +256,7 @@ private:
   typedef ComponentContainer::iterator ComponentIter;
 
   ComponentContainer mComponents;  ///< ScrollComponent (such as a scrollbar/page indicator/status)
-  bool mOvershootEnabled;
+  bool mOvershootEnabled:1;
 };
 
 } // namespace Internal