X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fevents%2Fgesture-requests.h;h=b47d0b331b25984980a0acf2c2a18a828cb9f6e9;hb=7d85b865d2daf8d235eaea3d3b4716eb5105a2be;hp=06a41bc52ab634e794d4e1d4fd5ead16248f0aba;hpb=e297587a6b95d1172021fb14cda86db76ccc976d;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/event/events/gesture-requests.h b/dali/internal/event/events/gesture-requests.h
index 06a41bc..b47d0b3 100644
--- a/dali/internal/event/events/gesture-requests.h
+++ b/dali/internal/event/events/gesture-requests.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_GESTURE_REQUESTS_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -20,14 +20,14 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/events/gesture.h>
-#include <dali/devel-api/events/gesture-devel.h>
+
+// EXTERNAL INCLUDES
+#include <limits> // for numeric_limits::max();
 
 namespace Dali
 {
-
 namespace Internal
 {
-
 /**
  * This structure specifies the gesture type required (or no longer required) by Core.
  */
@@ -39,16 +39,8 @@ struct GestureRequest
    * Default Constructor
    * @param[in]  typeRequired  The gesture type required
    */
-  GestureRequest( DevelGesture::Type typeRequired )
-  : type( typeRequired )
-  {
-  }
-
-  /**
-   * @copydoc GestureRequest( DevelGesture::Type )
-   */
-  GestureRequest( Gesture::Type typeRequired )
-  : GestureRequest( static_cast< DevelGesture::Type >( typeRequired ) )
+  GestureRequest(GestureType::Value typeRequired)
+  : type(typeRequired)
   {
   }
 
@@ -59,7 +51,7 @@ struct GestureRequest
 
   // Data Members
 
-  DevelGesture::Type type; ///< The type of gesture required.
+  GestureType::Value type; ///< The type of gesture required.
 };
 
 /**
@@ -73,23 +65,23 @@ struct PanGestureRequest : public GestureRequest
    * Default Constructor
    */
   PanGestureRequest()
-  : GestureRequest(Gesture::Pan),
+  : GestureRequest(GestureType::PAN),
     minTouches(1),
-    maxTouches(1)
+    maxTouches(1),
+    maxMotionEventAge(std::numeric_limits<uint32_t>::max())
   {
   }
 
   /**
    * Virtual destructor
    */
-  virtual ~PanGestureRequest()
-  {
-  }
+  ~PanGestureRequest() override = default;
 
   // Data Members
 
-  unsigned int minTouches; ///< The minimum number of touch points required for a pan gesture.
-  unsigned int maxTouches; ///< The maximum number of touch points required for a pan gesture.
+  uint32_t minTouches;        ///< The minimum number of touch points required for a pan gesture.
+  uint32_t maxTouches;        ///< The maximum number of touch points required for a pan gesture.
+  uint32_t maxMotionEventAge; ///< The maximum age of motion events as milliseconds.
 };
 
 /**
@@ -103,7 +95,7 @@ struct TapGestureRequest : public GestureRequest
    * Default Constructor
    */
   TapGestureRequest()
-  : GestureRequest(Gesture::Tap),
+  : GestureRequest(GestureType::TAP),
     minTaps(1),
     maxTaps(1),
     minTouches(1),
@@ -114,9 +106,7 @@ struct TapGestureRequest : public GestureRequest
   /**
    * Virtual destructor
    */
-  virtual ~TapGestureRequest()
-  {
-  }
+  ~TapGestureRequest() override = default;
 
   // Data Members
 
@@ -137,7 +127,7 @@ struct LongPressGestureRequest : public GestureRequest
    * Default Constructor
    */
   LongPressGestureRequest()
-  : GestureRequest(Gesture::LongPress),
+  : GestureRequest(GestureType::LONG_PRESS),
     minTouches(1),
     maxTouches(1)
   {
@@ -146,9 +136,7 @@ struct LongPressGestureRequest : public GestureRequest
   /**
    * Virtual destructor
    */
-  virtual ~LongPressGestureRequest()
-  {
-  }
+  ~LongPressGestureRequest() override = default;
 
   // Data Members