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

!48095 修复Refresh组件刷新状态下使用自定义样式替换默认样式时显示异常的问题

Browse Source 
Merge pull request !48095 from zhangDH/Refresh
This commit is contained in:
openharmony_ci 2024-11-09 07:16:46 +00:00 committed by Gitee
commit 4b755b679f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frameworks/core/components_ng/pattern/refresh/refresh_pattern.cpp
View File

@ -576,7 +576,7 @@ void RefreshPattern::AddCustomBuilderNode(const RefPtr<NG::UINode>& builder)
if (!isCustomBuilderExist_) {
if (progressChild_) {
if (hasLoadingText_) {
if (columnNode_) {
host->RemoveChild(columnNode_);
columnNode_ = nullptr;
loadingTextNode_ = nullptr;
@ -742,7 +742,7 @@ void RefreshPattern::UpdateScrollTransition(float scrollOffset)
CHECK_NULL_VOID(host);
int32_t childCount = host->TotalChildCount();
// If the refresh has no children without loadingProgress and text, it does not need to update offset.
if (childCount < 2 || (childCount == 2 && hasLoadingText_)) { // 2 means loadingProgress and text child components.
if (childCount < 2 || (childCount == 2 && columnNode_)) { // 2 means loadingProgress and text child components.
return;
}
// Need to search for frameNode and skip ComponentNode
@ -803,7 +803,7 @@ float RefreshPattern::GetLoadingVisibleHeight()
CHECK_NULL_RETURN(renderContext, 0.0f);
auto geometryNode = progressChild_->GetGeometryNode();
CHECK_NULL_RETURN(geometryNode, 0.0f);
if (hasLoadingText_) {
if (loadingTextNode_) {
auto loadingTextGeometryNode = loadingTextNode_->GetGeometryNode();
CHECK_NULL_RETURN(loadingTextGeometryNode, 0.0f);
loadingHeight = geometryNode->GetFrameSize().Height() + loadingTextGeometryNode->GetFrameSize().Height() +