!49171 修复先更新cutout避让区域导致后续更新cutout时未标脏

Merge pull request !49171 from bizhenhang/fixcAvoidKeyboardTdd
This commit is contained in:
openharmony_ci 2024-11-22 03:45:36 +00:00 committed by Gitee
commit 67b4c171dd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -380,10 +380,6 @@ void UpdateSafeArea(const RefPtr<PipelineBase>& pipelineContext,
CHECK_NULL_VOID(safeAreaManager); CHECK_NULL_VOID(safeAreaManager);
uint32_t keyboardHeight = safeAreaManager->GetKeyboardInset().Length(); uint32_t keyboardHeight = safeAreaManager->GetKeyboardInset().Length();
safeAreaManager->UpdateKeyboardSafeArea(keyboardHeight, config.Height()); safeAreaManager->UpdateKeyboardSafeArea(keyboardHeight, config.Height());
if (avoidAreas.find(OHOS::Rosen::AvoidAreaType::TYPE_CUTOUT) == avoidAreas.end()) {
safeAreaManager->UpdateCutoutSafeArea(container->GetViewSafeAreaByType(Rosen::AvoidAreaType::TYPE_CUTOUT),
NG::OptionalSize<uint32_t>(config.Width(), config.Height()));
}
ParseAvoidAreasUpdate(context, avoidAreas, config); ParseAvoidAreasUpdate(context, avoidAreas, config);
AvoidAreasUpdateOnUIExtension(context, avoidAreas); AvoidAreasUpdateOnUIExtension(context, avoidAreas);
} }