From a149f8a42281b3fc0b674a9d0b5892aedeec5f2c Mon Sep 17 00:00:00 2001 From: lancer Date: Wed, 26 Jun 2024 11:57:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=83=8F=E7=B4=A0=E5=8F=96=E6=95=B4=E8=B0=83?= =?UTF-8?q?=E8=AF=95=E5=BC=80=E5=85=B3=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20Signed-off-by:=20haoshuo=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adapter/ohos/osal/system_properties.cpp | 4 +++- adapter/preview/osal/system_properties.cpp | 6 +----- frameworks/base/utils/system_properties.h | 8 +++++++- .../components_ng/render/adapter/rosen_render_context.cpp | 2 +- test/mock/base/mock_system_properties.cpp | 1 + 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/adapter/ohos/osal/system_properties.cpp b/adapter/ohos/osal/system_properties.cpp index 8c7d10a83e9..981ad8d464d 100644 --- a/adapter/ohos/osal/system_properties.cpp +++ b/adapter/ohos/osal/system_properties.cpp @@ -363,6 +363,7 @@ bool SystemProperties::traceInputEventEnable_ = IsTraceInputEventEnabled() && de bool SystemProperties::stateManagerEnable_ = IsStateManagerEnable(); bool SystemProperties::buildTraceEnable_ = IsBuildTraceEnabled() && developerModeOn_; bool SystemProperties::syncDebugTraceEnable_ = IsSyncDebugTraceEnabled(); +bool SystemProperties::pixelRoundEnable_ = IsPixelRoundEnabled(); bool SystemProperties::textTraceEnable_ = IsTextTraceEnabled(); bool SystemProperties::accessTraceEnable_ = IsAccessTraceEnabled(); bool SystemProperties::accessibilityEnabled_ = IsAccessibilityEnabled(); @@ -548,6 +549,7 @@ void SystemProperties::InitDeviceInfo( stateManagerEnable_ = IsStateManagerEnable(); buildTraceEnable_ = IsBuildTraceEnabled() && developerModeOn_; syncDebugTraceEnable_ = IsSyncDebugTraceEnabled(); + pixelRoundEnable_ = IsPixelRoundEnabled(); accessibilityEnabled_ = IsAccessibilityEnabled(); canvasDebugMode_ = ReadCanvasDebugMode(); isHookModeEnabled_ = IsHookModeEnabled(); @@ -664,7 +666,7 @@ bool SystemProperties::GetDebugPixelMapSaveEnabled() return system::GetBoolParameter("persist.ace.save.pixelmap.enabled", false); } -bool SystemProperties::GetPixelRoundEnable() +bool SystemProperties::IsPixelRoundEnabled() { return system::GetBoolParameter("ace.debug.pixelround.enabled", true); } diff --git a/adapter/preview/osal/system_properties.cpp b/adapter/preview/osal/system_properties.cpp index 0ce823fa6e4..718b9f313d7 100644 --- a/adapter/preview/osal/system_properties.cpp +++ b/adapter/preview/osal/system_properties.cpp @@ -45,6 +45,7 @@ bool SystemProperties::traceInputEventEnable_ = false; bool SystemProperties::stateManagerEnable_ = false; bool SystemProperties::buildTraceEnable_ = false; bool SystemProperties::syncDebugTraceEnable_ = false; +bool SystemProperties::pixelRoundEnable_ = true; bool SystemProperties::textTraceEnable_ = false; bool SystemProperties::accessTraceEnable_ = false; bool SystemProperties::accessibilityEnabled_ = false; @@ -248,11 +249,6 @@ bool SystemProperties::GetDebugPixelMapSaveEnabled() return false; } -bool SystemProperties::GetPixelRoundEnable() -{ - return true; -} - bool SystemProperties::GetResourceDecoupling() { return true; diff --git a/frameworks/base/utils/system_properties.h b/frameworks/base/utils/system_properties.h index 1c23bbb5861..5d0ef655a6e 100644 --- a/frameworks/base/utils/system_properties.h +++ b/frameworks/base/utils/system_properties.h @@ -231,7 +231,7 @@ public: static bool GetDebugPixelMapSaveEnabled(); - static bool GetPixelRoundEnable(); + static bool IsPixelRoundEnabled(); static bool GetRosenBackendEnabled() { @@ -283,6 +283,11 @@ public: return syncDebugTraceEnable_; } + static bool GetPixelRoundEnabled() + { + return pixelRoundEnable_; + } + static bool GetTextTraceEnabled() { return textTraceEnable_; @@ -541,6 +546,7 @@ private: static bool traceInputEventEnable_; static bool buildTraceEnable_; static bool syncDebugTraceEnable_; + static bool pixelRoundEnable_; static bool textTraceEnable_; static bool accessTraceEnable_; static bool accessibilityEnabled_; diff --git a/frameworks/core/components_ng/render/adapter/rosen_render_context.cpp b/frameworks/core/components_ng/render/adapter/rosen_render_context.cpp index cec6fae71a7..a2c465364e1 100644 --- a/frameworks/core/components_ng/render/adapter/rosen_render_context.cpp +++ b/frameworks/core/components_ng/render/adapter/rosen_render_context.cpp @@ -6138,7 +6138,7 @@ void RosenRenderContext::SavePaintRect(bool isRound, uint8_t flag) const auto& geometryNode = host->GetGeometryNode(); CHECK_NULL_VOID(geometryNode); AdjustPaintRect(); - if (!SystemProperties::GetPixelRoundEnable()) { + if (!SystemProperties::GetPixelRoundEnabled()) { isRound = false; } if (Container::GreatOrEqualAPITargetVersion(PlatformVersion::VERSION_TWELVE)) { diff --git a/test/mock/base/mock_system_properties.cpp b/test/mock/base/mock_system_properties.cpp index 549349df5de..0ae4868dc36 100644 --- a/test/mock/base/mock_system_properties.cpp +++ b/test/mock/base/mock_system_properties.cpp @@ -41,6 +41,7 @@ bool SystemProperties::layoutTraceEnable_ = false; bool SystemProperties::traceInputEventEnable_ = false; bool SystemProperties::buildTraceEnable_ = false; bool SystemProperties::syncDebugTraceEnable_ = false; +bool SystemProperties::pixelRoundEnable_ = true; bool SystemProperties::textTraceEnable_ = false; double SystemProperties::resolution_ = 0.0; constexpr float defaultAnimationScale = 1.0f;