[dali_1.2.37] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / internal / event / events / pan-gesture-detector-impl.h

diff --git a/dali/internal/event/events/pan-gesture-detector-impl.h b/dali/internal/event/events/pan-gesture-detector-impl.h
index 257d123..845b714 100644 (file)
--- a/dali/internal/event/events/pan-gesture-detector-impl.h
+++ b/dali/internal/event/events/pan-gesture-detector-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_PAN_GESTURE_DETECTOR_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -49,8 +49,8 @@ class PanGestureDetector : public GestureDetector
 {
 public: // Typedefs
 
-  typedef Dali::PanGestureDetector::AngleContainer AngleContainer;
   typedef Dali::PanGestureDetector::AngleThresholdPair AngleThresholdPair;
+  typedef std::vector<AngleThresholdPair> AngleContainer;
 
 public: // Creation
 
@@ -98,9 +98,14 @@ public:
   void AddDirection( Radian direction, Radian threshold );
 
   /**
-   * @copydoc Dali::PanGestureDetector::GetAngles()
+   * @copydoc Dali::PanGestureDetector::GetAngleCount()
    */
-  const AngleContainer& GetAngles() const;
+  size_t GetAngleCount() const;
+
+  /**
+   * @copydoc Dali::PanGestureDetector::GetAngle()
+   */
+  AngleThresholdPair GetAngle(size_t index) const;
 
   /**
    * @copydoc Dali::PanGestureDetector::ClearAngles()
@@ -259,6 +264,11 @@ private:
   virtual Property::Value GetDefaultProperty( Property::Index index ) const;
 
   /**
+   * @copydoc Dali::Internal::Object::GetDefaultPropertyCurrentValue()
+   */
+  virtual Property::Value GetDefaultPropertyCurrentValue( Property::Index index ) const;
+
+  /**
    * @copydoc Dali::Internal::Object::GetSceneObject()
    */
   virtual const SceneGraph::PropertyOwner* GetSceneObject() const;