openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-27 09:12:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix toast avoid keyboard in web

Browse Source 
Signed-off-by: z30053720 <zhaoyong70@huawei.com>
This commit is contained in:
z30053720 2024-11-09 15:57:47 +08:00
parent 4b755b679f
commit 1b7684f93e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,6 +176,9 @@ bool ToastPattern::OnDirtyLayoutWrapperSwap(const RefPtr<LayoutWrapper>& dirty,
auto keyboardAnimationConfig = context->GetKeyboardAnimationConfig(); auto keyboardAnimationConfig = context->GetKeyboardAnimationConfig();
auto safeAreaManager = context->GetSafeAreaManager(); auto safeAreaManager = context->GetSafeAreaManager();
auto keyboardHeight = safeAreaManager ? safeAreaManager->GetKeyboardInset().Length() : 0; auto keyboardHeight = safeAreaManager ? safeAreaManager->GetKeyboardInset().Length() : 0;
if (safeAreaManager && NearEqual(keyboardHeight, 0.0f)) {
keyboardHeight = safeAreaManager->GetRawKeyboardHeight();
}
AnimationOption option = AnimationUtil::CreateKeyboardAnimationOption(keyboardAnimationConfig, keyboardHeight); AnimationOption option = AnimationUtil::CreateKeyboardAnimationOption(keyboardAnimationConfig, keyboardHeight);
context->Animate(option, option.GetCurve(), func); context->Animate(option, option.GetCurve(), func);
} else { } else {
@ -261,8 +264,11 @@ void ToastPattern::AdjustOffsetForKeyboard(Dimension& offsetY, double toastBotto
CHECK_NULL_VOID(context); CHECK_NULL_VOID(context);
auto safeAreaManager = context->GetSafeAreaManager(); auto safeAreaManager = context->GetSafeAreaManager();
auto keyboardInset = safeAreaManager ? safeAreaManager->GetKeyboardInset().Length() : 0; auto keyboardInset = safeAreaManager ? safeAreaManager->GetKeyboardInset().Length() : 0;
auto keyboardOffset = safeAreaManager ? safeAreaManager->GetKeyboardInset().start : 0; if (safeAreaManager && NearEqual(keyboardInset, 0.0f)) {
keyboardInset = safeAreaManager->GetRawKeyboardHeight();
}
auto deviceHeight = context->GetRootHeight(); auto deviceHeight = context->GetRootHeight();
auto keyboardOffset = deviceHeight - keyboardInset;
if (IsAlignedWithHostWindow() && GreatNotEqual(keyboardInset, 0)) { if (IsAlignedWithHostWindow() && GreatNotEqual(keyboardInset, 0)) {
deviceHeight = uiExtensionHostWindowRect_.Height(); deviceHeight = uiExtensionHostWindowRect_.Height();
@ -290,7 +296,7 @@ void ToastPattern::AdjustOffsetForKeyboard(Dimension& offsetY, double toastBotto
TAG_LOGD(AceLogTag::ACE_OVERLAY, TAG_LOGD(AceLogTag::ACE_OVERLAY,
"toast device height: %{public}.2f, keyboardOffset: %{public}d, " "toast device height: %{public}.2f, keyboardOffset: %{public}d, "
"textHeight: %{public}.2f, offsetY: %{public}.2f", "textHeight: %{public}.2f, offsetY: %{public}.2f",
deviceHeight, keyboardOffset, textHeight, offsetY.Value()); deviceHeight, (uint32_t)keyboardOffset, textHeight, offsetY.Value());
} }
double ToastPattern::GetBottomValue(const RefPtr<LayoutWrapper>& layoutWrapper) double ToastPattern::GetBottomValue(const RefPtr<LayoutWrapper>& layoutWrapper)