Property refactor in dali-core: Core changes

[platform/core/uifw/dali-core.git] / dali / public-api / events / pan-gesture-detector.h

diff --git a/dali/public-api/events/pan-gesture-detector.h b/dali/public-api/events/pan-gesture-detector.h
index 94ebca6..f5f50a2 100644 (file)
--- a/dali/public-api/events/pan-gesture-detector.h
+++ b/dali/public-api/events/pan-gesture-detector.h
@@ -20,6 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/events/gesture-detector.h>
+#include <dali/public-api/object/property-index-ranges.h>
 #include <dali/public-api/signals/dali-signal.h>
 
 namespace Dali
@@ -60,6 +61,23 @@ class DALI_IMPORT_API PanGestureDetector : public GestureDetector
 {
 public:
 
+  /**
+   * @brief An enumeration of properties belonging to the PanGestureDetector class.
+   */
+  struct Property
+  {
+    enum
+    {
+      ScreenPosition = DEFAULT_GESTURE_DETECTOR_PROPERTY_START_INDEX, ///< name "screen-position",     type Vector2
+      ScreenDisplacement,                                             ///< name "screen-displacement", type Vector2
+      ScreenVelocity,                                                 ///< name "screen-velocity",     type Vector2
+      LocalPosition,                                                  ///< name "local-position",      type Vector2
+      LocalDisplacement,                                              ///< name "local-displacement",  type Vector2
+      LocalVelocity,                                                  ///< name "local-velocity",      type Vector2
+      Panning,                                                        ///< name "panning",             type Boolean
+    };
+  };
+
   // Typedefs
   typedef Signal< void ( Actor, const PanGesture& ) > DetectedSignalType; ///< Pan gesture detected signal type
 
@@ -76,17 +94,6 @@ public:
 
   static const Radian DEFAULT_THRESHOLD;    ///< The default threshold is PI * 0.25 radians (or 45 degrees).
 
-  /// @name Properties
-  /** @{ */
-  static const Property::Index SCREEN_POSITION;       ///< name "screen-position",     type VECTOR2
-  static const Property::Index SCREEN_DISPLACEMENT;   ///< name "screen-displacement", type VECTOR2
-  static const Property::Index SCREEN_VELOCITY;       ///< name "screen-velocity",     type VECTOR2
-  static const Property::Index LOCAL_POSITION;        ///< name "local-position",      type VECTOR2
-  static const Property::Index LOCAL_DISPLACEMENT;    ///< name "local-displacement",  type VECTOR2
-  static const Property::Index LOCAL_VELOCITY;        ///< name "local-velocity",      type VECTOR2
-  static const Property::Index PANNING;               ///< name "panning",             type BOOLEAN
-  /** @} */
-
 public: // Creation & Destruction
 
   /**