From: junsu choi Date: Wed, 11 Aug 2021 01:00:01 +0000 (+0000) Subject: Merge "CanvasRenderer::Shape: Remove unnecessary header" into devel/master X-Git-Tag: dali_2.0.39~2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=2720128f67f1c1bd0526d0b25e8d50c97a7950bd;hp=602bdd22ca29d613046b27bebdd4630d3fb72933 Merge "CanvasRenderer::Shape: Remove unnecessary header" into devel/master --- diff --git a/dali/devel-api/adaptor-framework/accessibility-impl.cpp b/dali/devel-api/adaptor-framework/accessibility-impl.cpp index 48b1a10..e7b72cb 100644 --- a/dali/devel-api/adaptor-framework/accessibility-impl.cpp +++ b/dali/devel-api/adaptor-framework/accessibility-impl.cpp @@ -28,6 +28,7 @@ // INTERNAL INCLUDES #include +#include #include #include @@ -625,7 +626,16 @@ public: Vector3 anchorPointOffSet = size * (positionUsesAnchorPoint ? actor.GetCurrentProperty(Actor::Property::ANCHOR_POINT) : AnchorPoint::TOP_LEFT); Vector2 position = Vector2(screenPosition.x - anchorPointOffSet.x, screenPosition.y - anchorPointOffSet.y); - return {position.x, position.y, size.x, size.y}; + if(type == Dali::Accessibility::CoordinateType::WINDOW) + { + return {position.x, position.y, size.x, size.y}; + } + else // Dali::Accessibility::CoordinateType::SCREEN + { + auto window = Dali::DevelWindow::Get(actor); + auto windowPosition = window.GetPosition(); + return {position.x + windowPosition.GetX(), position.y + windowPosition.GetY(), size.x, size.y}; + } } Dali::Accessibility::ComponentLayer GetLayer() override 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" diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp index 1d040b8..01aa1c8 100644 --- a/dali/public-api/dali-adaptor-version.cpp +++ b/dali/public-api/dali-adaptor-version.cpp @@ -27,7 +27,7 @@ namespace Dali { const unsigned int ADAPTOR_MAJOR_VERSION = 2; const unsigned int ADAPTOR_MINOR_VERSION = 0; -const unsigned int ADAPTOR_MICRO_VERSION = 37; +const unsigned int ADAPTOR_MICRO_VERSION = 38; const char* const ADAPTOR_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index 49fb574..ce18a66 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -17,7 +17,7 @@ Name: dali2-adaptor Summary: The DALi Tizen Adaptor -Version: 2.0.37 +Version: 2.0.38 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT @@ -238,14 +238,7 @@ Requires: %{name} = %{version}-%{release} %description dali2-feedback-plugin Feedback plugin to play haptic and audio feedback for Dali -############################## -# Preparation -############################## -%prep -%setup -q - #Use TZ_PATH when tizen version is 3.x or greater - %define dali_data_rw_dir %TZ_SYS_RO_SHARE/dali/ %define dali_data_ro_dir %TZ_SYS_RO_SHARE/dali/ %define font_preloaded_path %TZ_SYS_RO_SHARE/fonts/ @@ -257,6 +250,13 @@ Feedback plugin to play haptic and audio feedback for Dali %define dali_plugin_sound_files /plugins/sounds/ ############################## +# Preparation +############################## +%prep +%setup -q + + +############################## # Build ############################## %build @@ -317,7 +317,7 @@ cmake_flags+=" -DCOMPONENT_APPLICATION_SUPPORT=YES" # if mobile || "undefined" %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" -mkdir mobile +mkdir -p mobile pushd mobile cmake -DENABLE_PROFILE=MOBILE $cmake_flags .. @@ -333,7 +333,7 @@ popd # if tv ||"undefined" %if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" -mkdir tv +mkdir -p tv pushd tv cmake -DENABLE_PROFILE=TV $cmake_flags .. @@ -349,7 +349,7 @@ popd # if wearable || "undefined" %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" -mkdir wearable +mkdir -p wearable pushd wearable cmake -DENABLE_PROFILE=WEARABLE $cmake_flags .. @@ -365,7 +365,7 @@ popd # if ivi ||"undefined" %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile" -mkdir ivi +mkdir -p ivi pushd ivi cmake -DENABLE_PROFILE=IVI $cmake_flags .. @@ -382,7 +382,7 @@ popd # if common ||"undefined" %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" -mkdir common +mkdir -p common pushd common cmake -DENABLE_PROFILE=COMMON $cmake_flags ..