openharmony/windowmanager
1
0
Fork 0
mirror of https://github.com/openharmony/windowmanager.git synced 2026-07-20 20:20:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

!1207 animationTransitionController callback

Browse Source 
Merge pull request !1207 from 杨志荣/weekly_20220712
This commit is contained in:
openharmony_ci
2022-07-19 11:16:29 +00:00
committed by Gitee
parent 59c40352d2 dd3b277127
commit ddbcf3e145
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wm/src/window_impl.cpp
+16 -5
View File
@@ -1044,11 +1044,6 @@ WMError WindowImpl::Show(uint32_t reason, bool withAnimation)
if (ret == WMError::WM_OK || ret == WMError::WM_ERROR_DEATH_RECIPIENT) {
state_ = WindowState::STATE_SHOWN;
NotifyAfterForeground();
uint32_t animationFlag = property_->GetAnimationFlag();
if (animationFlag == static_cast<uint32_t>(WindowAnimation::CUSTOM)) {
// CustomAnimation is enabled when animationTranistionController_ exists
animationTranistionController_->AnimationForShown();
}
} else if (ret == WMError::WM_ERROR_INVALID_WINDOW_MODE_OR_SIZE) {
NotifyForegroundInvalidWindowMode();
} else {
@@ -1676,6 +1671,22 @@ void WindowImpl::RegisterAnimationTransitionController(const sptr<IAnimationTran
return;
}
animationTranistionController_ = listener;
wptr<WindowProperty> propertyToken(property_);
wptr<IAnimationTransitionController> animationTransitionControllerToken(animationTranistionController_);
if (uiContent_) {
uiContent_->SetNextFrameLayoutCallback([propertyToken, animationTransitionControllerToken]() {
auto property = propertyToken.promote();
auto animationTransitionController = animationTransitionControllerToken.promote();
if (!property || !animationTransitionController) {
return;
}
uint32_t animationFlag = property->GetAnimationFlag();
if (animationFlag == static_cast<uint32_t>(WindowAnimation::CUSTOM)) {
// CustomAnimation is enabled when animationTranistionController_ exists
animationTransitionController->AnimationForShown();
}
});
}
}
void WindowImpl::RegisterScreenshotListener(const sptr<IScreenshotListener>& listener)