From bf4092e397b2f1a34b50fb9dd455b2cae50a2715 Mon Sep 17 00:00:00 2001 From: "joogab.yun" Date: Thu, 22 Jul 2021 17:34:19 +0900 Subject: [PATCH] Add SetTapMaximumAllowedTime Sets the MaximumAllowedTime of the tap gesture as an environment variable. Change-Id: I465a41c39cce8ec5e67b85bc014f5b1063e20710 --- dali/internal/adaptor/common/adaptor-impl.cpp | 5 +++++ dali/internal/system/common/environment-options.cpp | 7 +++++++ dali/internal/system/common/environment-options.h | 6 ++++++ dali/internal/system/common/environment-variables.h | 3 +++ 4 files changed, 21 insertions(+) diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp index 6338359..fabadaf 100644 --- a/dali/internal/adaptor/common/adaptor-impl.cpp +++ b/dali/internal/adaptor/common/adaptor-impl.cpp @@ -290,6 +290,11 @@ void Adaptor::Initialize(GraphicsFactory& graphicsFactory) { Integration::SetLongPressMinimumHoldingTime(mEnvironmentOptions->GetLongPressMinimumHoldingTime()); } + if(mEnvironmentOptions->GetTapMaximumAllowedTime() > 0) + { + Integration::SetTapMaximumAllowedTime(mEnvironmentOptions->GetTapMaximumAllowedTime()); + } + std::string systemCachePath = GetSystemCachePath(); if(!systemCachePath.empty()) diff --git a/dali/internal/system/common/environment-options.cpp b/dali/internal/system/common/environment-options.cpp index 8fec77f..6de61e0 100644 --- a/dali/internal/system/common/environment-options.cpp +++ b/dali/internal/system/common/environment-options.cpp @@ -238,6 +238,7 @@ EnvironmentOptions::EnvironmentOptions() mRotationMinimumTouchEvents(-1), mRotationMinimumTouchEventsAfterStart(-1), mLongPressMinimumHoldingTime(-1), + mTapMaximumAllowedTime(-1), mGlesCallTime(0), mMultiSamplingLevel(DEFAULT_MULTI_SAMPLING_LEVEL), mThreadingMode(ThreadingMode::COMBINED_UPDATE_RENDER), @@ -433,6 +434,11 @@ int EnvironmentOptions::GetLongPressMinimumHoldingTime() const return mLongPressMinimumHoldingTime; } +int EnvironmentOptions::GetTapMaximumAllowedTime() const +{ + return mTapMaximumAllowedTime; +} + unsigned int EnvironmentOptions::GetWindowWidth() const { return mWindowWidth; @@ -556,6 +562,7 @@ void EnvironmentOptions::ParseEnvironmentOptions() SetFromEnvironmentVariable(DALI_ENV_ROTATION_MINIMUM_TOUCH_EVENTS_AFTER_START, mRotationMinimumTouchEventsAfterStart); SetFromEnvironmentVariable(DALI_ENV_LONG_PRESS_MINIMUM_HOLDING_TIME, mLongPressMinimumHoldingTime); + SetFromEnvironmentVariable(DALI_ENV_TAP_MAXIMUM_ALLOWED_TIME, mTapMaximumAllowedTime); SetFromEnvironmentVariable(DALI_GLES_CALL_TIME, mGlesCallTime); SetFromEnvironmentVariable(DALI_GLES_CALL_ACCUMULATE, [&](int glesCallAccumulate) { mGlesCallAccumulate = glesCallAccumulate != 0; }); diff --git a/dali/internal/system/common/environment-options.h b/dali/internal/system/common/environment-options.h index 0b4e44c..4ba290c 100644 --- a/dali/internal/system/common/environment-options.h +++ b/dali/internal/system/common/environment-options.h @@ -244,6 +244,11 @@ public: int GetLongPressMinimumHoldingTime() const; /** + * @return The maximum allowed time required to be recognized as a multi tap gesture (millisecond) + */ + int GetTapMaximumAllowedTime() const; + + /** * @return The width of the window */ unsigned int GetWindowWidth() const; @@ -382,6 +387,7 @@ private: // Data int mRotationMinimumTouchEvents; ///< minimum events required before a rotation starts int mRotationMinimumTouchEventsAfterStart; ///< minimum events required after a rotation started int mLongPressMinimumHoldingTime; ///< minimum holding time required to be recognized as a long press gesture (millisecond) + int mTapMaximumAllowedTime; ///< maximum allowed time required to be recognized as a multi tap gesture (millisecond) int mGlesCallTime; ///< time in seconds between status updates int mMultiSamplingLevel; ///< The number of samples required in multisample buffers diff --git a/dali/internal/system/common/environment-variables.h b/dali/internal/system/common/environment-variables.h index ab3f1b9..f4b661a 100644 --- a/dali/internal/system/common/environment-variables.h +++ b/dali/internal/system/common/environment-variables.h @@ -95,6 +95,9 @@ namespace Adaptor */ #define DALI_ENV_LONG_PRESS_MINIMUM_HOLDING_TIME "DALI_LONG_PRESS_MINIMUM_HOLDING_TIME" +// Tap-Gesture maximum allowed time required to be recognized as a multi tap gesture (millisecond) +#define DALI_ENV_TAP_MAXIMUM_ALLOWED_TIME "DALI_TAP_MAXIMUM_ALLOWED_TIME" + #define DALI_GLES_CALL_TIME "DALI_GLES_CALL_TIME" #define DALI_GLES_CALL_ACCUMULATE "DALI_GLES_CALL_ACCUMULATE" -- 2.7.4