openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2025-04-01 06:53:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!12894 popup组件暂时屏蔽消失动效

Browse Source 
Merge pull request !12894 from sunjiakun/popup-0508
This commit is contained in:
openharmony_ci 2023-05-09 07:47:00 +00:00 committed by Gitee
commit 61fcd26d2e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frameworks/core/components_ng/base/view_abstract.cpp
View File

@ -953,12 +953,8 @@ void ViewAbstract::BindPopup(
popupPattern->StartEnteringAnimation(nullptr);
}
} else {
if (popupPattern) {
popupPattern->StartExitingAnimation([targetId]() {
LOGI("Popup now hide in subwindow.");
SubwindowManager::GetInstance()->HidePopupNG(targetId);
});
}
LOGI("Popup now hide in subwindow.");
SubwindowManager::GetInstance()->HidePopupNG(targetId);
}
return;
}
@ -979,15 +975,8 @@ void ViewAbstract::BindPopup(
popupPattern->StartEnteringAnimation(nullptr);
}
} else {
if (popupPattern) {
popupPattern->StartExitingAnimation(
[targetId, popupInfo, weakOverlayManger = AceType::WeakClaim(AceType::RawPtr(overlayManager))]() {
auto overlay = weakOverlayManger.Upgrade();
CHECK_NULL_VOID(overlay);
LOGI("begin to update popup node.");
overlay->UpdatePopupNode(targetId, popupInfo);
});
}
LOGI("begin to update popup node.");
overlayManager->UpdatePopupNode(targetId, popupInfo);
}
}

15
frameworks/core/components_ng/pattern/bubble/bubble_pattern.cpp
View File

@ -289,16 +289,11 @@ void BubblePattern::PopBubble()
auto layoutProp = host->GetLayoutProperty<BubbleLayoutProperty>();
CHECK_NULL_VOID(layoutProp);
auto showInSubWindow = layoutProp->GetShowInSubWindow().value_or(false);
StartExitingAnimation([showInSubWindow, targetId = targetNodeId_, popupInfo,
weakOverlayManger = AceType::WeakClaim(AceType::RawPtr(overlayManager))]() {
if (showInSubWindow) {
SubwindowManager::GetInstance()->HidePopupNG(targetId);
} else {
auto overlay = weakOverlayManger.Upgrade();
CHECK_NULL_VOID(overlay);
overlay->UpdatePopupNode(targetId, popupInfo);
}
});
if (showInSubWindow) {
SubwindowManager::GetInstance()->HidePopupNG(targetNodeId_);
} else {
overlayManager->UpdatePopupNode(targetNodeId_, popupInfo);
}
}
RefPtr<PopupTheme> BubblePattern::GetPopupTheme()