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

!38316 【bug】reset需求问题修复

Browse Source 
Merge pull request !38316 from 吴寅潇/fixResetReqBugs
This commit is contained in:
openharmony_ci 2024-07-20 10:54:46 +00:00 committed by Gitee
commit 95dae27f1f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frameworks/core/components_ng/pattern/image/image_model_ng.cpp
View File

@ -132,6 +132,19 @@ void ImageModelNG::ResetImage()
CHECK_NULL_VOID(pattern);
pattern->SetNeedLoadAlt(false);
pattern->ResetImageAndAlt();
if (pattern->GetImageType() == ImagePattern::ImageType::ANIMATION) {
if (pattern->GetHasSizeChanged()) {
pattern->ResetPictureSize();
}
pattern->StopAnimation();
pattern->ResetImages();
if (!frameNode->GetChildren().empty()) {
auto imageFrameNode = AceType::DynamicCast<FrameNode>(frameNode->GetChildren().front());
ACE_RESET_NODE_LAYOUT_PROPERTY(ImageLayoutProperty, ImageSourceInfo, imageFrameNode);
frameNode->RemoveChild(imageFrameNode);
}
pattern->SetImageType(ImagePattern::ImageType::BASE);
}
}
void ImageModelNG::ResetImage(FrameNode* frameNode)

4
frameworks/core/components_ng/pattern/image/image_pattern.cpp
View File

@ -520,7 +520,7 @@ RefPtr<NodePaintMethod> ImagePattern::CreateNodePaintMethod()
return MakeRefPtr<ImagePaintMethod>(
obscuredImage_, isSelected_, overlayMod_, sensitive, interpolationDefault_);
}
return nullptr;
return MakeRefPtr<ImagePaintMethod>(nullptr, isSelected_, overlayMod_, sensitive, interpolationDefault_);
}
bool ImagePattern::OnDirtyLayoutWrapperSwap(const RefPtr<LayoutWrapper>& dirty, const DirtySwapConfig& config)
@ -2027,6 +2027,8 @@ void ImagePattern::ResetImageAndAlt()
auto rsRenderContext = frameNode->GetRenderContext();
CHECK_NULL_VOID(rsRenderContext);
rsRenderContext->ClearDrawCommands();
CloseSelectOverlay();
DestroyAnalyzerOverlay();
frameNode->MarkDirtyNode(PROPERTY_UPDATE_RENDER);
}