openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2025-02-25 15:24:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modify toast getSafeArea method

Browse Source 
Signed-off-by: yangziyong <nsyangziyong@huawei.com>
This commit is contained in:
yangziyong 2024-07-18 09:34:32 +08:00
parent cb14218e5e
commit a877198590
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frameworks/core/components_ng/pattern/toast/toast_pattern.cpp
View File

@ -103,8 +103,8 @@ Dimension ToastPattern::GetOffsetY(const RefPtr<LayoutWrapper>& layoutWrapper)
CHECK_NULL_RETURN(toastProp, Dimension(0.0));
auto textHeight = text->GetGeometryNode()->GetMarginFrameSize().Height();
Dimension offsetY;
const auto& safeArea = toastProp->GetSafeAreaInsets();
auto safeAreaOffset = safeArea ? safeArea->bottom_.Length() : 0.0f;
auto safeAreaManager = context->GetSafeAreaManager();
auto safeAreaOffset = safeAreaManager ? safeAreaManager->GetSystemSafeArea().bottom_.Length() : 0.0f;
if (!toastProp->HasToastAlignment()) {
auto toastBottom = GetBottomValue(layoutWrapper);
toastBottom_ = toastBottom;
@ -281,9 +281,8 @@ double ToastPattern::GetTextMaxHeight()
}
auto safeAreaManager = pipelineContext->GetSafeAreaManager();
CHECK_NULL_RETURN(safeAreaManager, 0.0);
auto bottom = safeAreaManager->GetSystemSafeArea().bottom_.Length();
auto top = safeAreaManager->GetSystemSafeArea().top_.Length();
auto bottom = safeAreaManager ? safeAreaManager->GetSystemSafeArea().bottom_.Length() : 0.0f;
auto top = safeAreaManager ? safeAreaManager->GetSystemSafeArea().top_.Length() : 0.0f;
auto maxHeight = deviceHeight - bottom - top - toastBottom_;
auto limitHeight = (deviceHeight - bottom - top) * 0.65;
if (GreatNotEqual(maxHeight, limitHeight)) {