openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2025-02-21 13:08:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!38560 文本选择菜单在小窗模式下不避让键盘(窗口整体避让)

Browse Source 
Merge pull request !38560 from LuckClover/NotAvoidKeyboard
This commit is contained in:
openharmony_ci 2024-07-23 09:37:14 +00:00 committed by Gitee
commit e144899f10
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frameworks/core/components_ng/pattern/select_overlay/select_overlay_layout_algorithm.cpp
View File

@ -67,7 +67,7 @@ void SelectOverlayLayoutAlgorithm::MeasureChild(LayoutWrapper* layoutWrapper)
CHECK_NULL_VOID(pipeline);
auto safeAreaManager = pipeline->GetSafeAreaManager();
CHECK_NULL_VOID(safeAreaManager);
auto keyboardHeight = safeAreaManager->GetKeyboardInset().Length();
auto keyboardHeight = safeAreaManager->IsNeedAvoidWindow() ? 0.0f : safeAreaManager->GetKeyboardInset().Length();
auto maxSize =
SizeF(layoutConstraint.maxSize.Width(), layoutConstraint.maxSize.Height() - keyboardHeight -
(info_->isUsingMouse ? info_->rightClickOffset.GetY() : 0.0f));
@ -546,7 +546,7 @@ OffsetF SelectOverlayLayoutAlgorithm::NewMenuAvoidStrategy(
auto topArea = safeAreaManager->GetSystemSafeArea().top_.Length();
auto keyboardInsert = safeAreaManager->GetKeyboardInset();
float positionX = (selectArea.Left() + selectArea.Right() - menuWidth) / 2.0f;
auto hasKeyboard = GreatNotEqual(keyboardInsert.Length(), 0.0f);
auto hasKeyboard = !safeAreaManager->IsNeedAvoidWindow() && GreatNotEqual(keyboardInsert.Length(), 0.0f);
auto downHandle = info_->handleReverse ? info_->firstHandle : info_->secondHandle;
auto downHandleIsReallyShow = hasKeyboard ? ((LessOrEqual((double)downHandle.paintRect.Bottom(),
(double)keyboardInsert.start)) ? true : false) : downHandle.isShow;