Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-adaptor.git] / dali / internal / system / common / environment-options.h

diff --git a/dali/internal/system/common/environment-options.h b/dali/internal/system/common/environment-options.h
old mode 100755 (executable)
new mode 100644 (file)
index 3fe351b..d8e630a
--- a/dali/internal/system/common/environment-options.h
+++ b/dali/internal/system/common/environment-options.h
@@ -23,8 +23,8 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
+#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
 #include <dali/internal/adaptor/common/threading-mode.h>
-#include <dali/integration-api/log-factory-interface.h>
 
 namespace Dali
 {
@@ -220,6 +220,11 @@ public:
   float GetMinimumPinchDistance() const;
 
   /**
+   * @return The minimum holding time required to be recognized as a long press gesture (milliseconds)
+   */
+  int GetLongPressMinimumHoldingTime() const;
+
+  /**
    * @return The width of the window
    */
   unsigned int GetWindowWidth() const;
@@ -291,11 +296,6 @@ public:
    */
   bool StencilBufferRequired() const;
 
-  /**
-   * @return whether the partial update is available.
-   */
-  bool PartialUpdateAvailable() const;
-
   /// Deleted copy constructor.
   EnvironmentOptions( const EnvironmentOptions& ) = delete;
 
@@ -352,13 +352,13 @@ private: // Data
   int mPanMinimumDistance;                        ///< minimum distance required before pan starts
   int mPanMinimumEvents;                          ///< minimum events required before pan starts
   float mPinchMinimumDistance;                    ///< minimum number of pixels moved before a pinch starts
+  int mLongPressMinimumHoldingTime;               ///< minimum holding time required to be recognized as a long press gesture (millisecond)
   int mGlesCallTime;                              ///< time in seconds between status updates
   int mMultiSamplingLevel;                        ///< The number of samples required in multisample buffers
   ThreadingMode::Type mThreadingMode;             ///< threading mode
   bool mGlesCallAccumulate;                       ///< Whether or not to accumulate gles call statistics
   bool mDepthBufferRequired;                      ///< Whether the depth buffer is required
   bool mStencilBufferRequired;                    ///< Whether the stencil buffer is required
-  bool mPartialUpdateAvailable;                   ///< whether the partial update is available
   std::unique_ptr<TraceManager> mTraceManager;    ///< TraceManager
 };