From c77e5a1768a3a55d79ccf5c76beebf60d851d578 Mon Sep 17 00:00:00 2001 From: lanyill Date: Wed, 15 Mar 2023 17:29:01 +0800 Subject: [PATCH] fix docs Alarm Signed-off-by: lanyill --- adapter/ohos/entrance/ace_new_pipe_judgement.cpp | 16 ++++++++-------- .../pattern/bubble/bubble_layout_algorithm.cpp | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/adapter/ohos/entrance/ace_new_pipe_judgement.cpp b/adapter/ohos/entrance/ace_new_pipe_judgement.cpp index fc1b84c8128..de308343a23 100644 --- a/adapter/ohos/entrance/ace_new_pipe_judgement.cpp +++ b/adapter/ohos/entrance/ace_new_pipe_judgement.cpp @@ -57,10 +57,10 @@ bool AceNewPipeJudgement::QueryAceNewPipeEnabledFA(const std::string& packagenam uint32_t apiTargetVersion, const std::string& apiReleaseType) { if (((apiTargetVersion == NEW_PIPE_MIN_VERSION && - (apiReleaseType == NEW_PIPE_ENABLED_RELEASE_TYPE || apiReleaseType == NEW_PIPE_ENABLED_RELEASE_TYPE_NEW || - SystemProperties::GetExtSurfaceEnabled())) || - apiTargetVersion > NEW_PIPE_MIN_VERSION) && - apiCompatibleVersion >= NEW_PIPE_MIN_VERSION) { + (apiReleaseType == NEW_PIPE_ENABLED_RELEASE_TYPE || apiReleaseType == NEW_PIPE_ENABLED_RELEASE_TYPE_NEW || + SystemProperties::GetExtSurfaceEnabled())) || + apiTargetVersion > NEW_PIPE_MIN_VERSION) && + apiCompatibleVersion >= NEW_PIPE_MIN_VERSION) { return true; } switch (aceNewPipeEnabledType_) { @@ -82,10 +82,10 @@ bool AceNewPipeJudgement::QueryAceNewPipeEnabledStage(const std::string& package return false; } if (((apiTargetVersion == NEW_PIPE_MIN_VERSION && - (apiReleaseType == NEW_PIPE_ENABLED_RELEASE_TYPE || apiReleaseType == NEW_PIPE_ENABLED_RELEASE_TYPE_NEW || - SystemProperties::GetExtSurfaceEnabled())) || - apiTargetVersion > NEW_PIPE_MIN_VERSION) && - apiCompatibleVersion >= NEW_PIPE_MIN_VERSION) { + (apiReleaseType == NEW_PIPE_ENABLED_RELEASE_TYPE || apiReleaseType == NEW_PIPE_ENABLED_RELEASE_TYPE_NEW || + SystemProperties::GetExtSurfaceEnabled())) || + apiTargetVersion > NEW_PIPE_MIN_VERSION) && + apiCompatibleVersion >= NEW_PIPE_MIN_VERSION) { return true; } switch (aceNewPipeEnabledType_) { diff --git a/frameworks/core/components_ng/pattern/bubble/bubble_layout_algorithm.cpp b/frameworks/core/components_ng/pattern/bubble/bubble_layout_algorithm.cpp index 5a54654b019..4ad8dc1556f 100644 --- a/frameworks/core/components_ng/pattern/bubble/bubble_layout_algorithm.cpp +++ b/frameworks/core/components_ng/pattern/bubble/bubble_layout_algorithm.cpp @@ -254,11 +254,11 @@ void BubbleLayoutAlgorithm::InitArrowTopAndBottomPosition(OffsetF& topArrowPosit { topArrowPosition = topPosition + OffsetF(std::max(padding_.Left().ConvertToPx(), border_.TopLeftRadius().GetX().ConvertToPx()) + - BEZIER_WIDTH_HALF.ConvertToPx(), - childSize.Height() + arrowHeight_); + BEZIER_WIDTH_HALF.ConvertToPx(), + childSize.Height() + arrowHeight_); bottomArrowPosition = bottomPosition + OffsetF(std::max(padding_.Left().ConvertToPx(), - border_.BottomLeftRadius().GetX().ConvertToPx()) + - BEZIER_WIDTH_HALF.ConvertToPx(), -arrowHeight_); + border_.BottomLeftRadius().GetX().ConvertToPx()) + + BEZIER_WIDTH_HALF.ConvertToPx(), -arrowHeight_); } OffsetF BubbleLayoutAlgorithm::GetPositionWithPlacement(const SizeF& childSize, const OffsetF& topPosition, -- Gitee