openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2025-01-26 12:27:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!15017 SideBarContainer在侧边栏变化前触发onChange

Browse Source 
Merge pull request !15017 from 李俊峰/sidebar
This commit is contained in:
openharmony_ci 2023-06-25 02:21:44 +00:00 committed by Gitee
commit 71580caf00
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frameworks/core/components_ng/pattern/side_bar/side_bar_container_pattern.cpp
View File

@ -312,6 +312,9 @@ void SideBarContainerPattern::DoAnimation()
sideBarStatus_ = SideBarStatus::CHANGING;
UpdateControlButtonIcon();
// fire before animation to include user changes in onChange event
FireChangeEvent(sideBarStatus == SideBarStatus::HIDDEN);
auto weak = AceType::WeakClaim(this);
auto context = PipelineContext::GetCurrentContext();
context->OpenImplicitAnimation(option, option.GetCurve(), [weak, sideBarStatus]() {
@ -319,11 +322,9 @@ void SideBarContainerPattern::DoAnimation()
if (pattern) {
if (sideBarStatus == SideBarStatus::HIDDEN) {
pattern->SetSideBarStatus(SideBarStatus::SHOW);
pattern->FireChangeEvent(true);
pattern->UpdateControlButtonIcon();
} else {
pattern->SetSideBarStatus(SideBarStatus::HIDDEN);
pattern->FireChangeEvent(false);
pattern->UpdateControlButtonIcon();
}
}
@ -368,13 +369,13 @@ void SideBarContainerPattern::DoSideBarAnimation()
auto sideBarPosition = layoutProperty->GetSideBarPosition().value_or(SideBarPosition::START);
bool isSideBarStart = sideBarPosition == SideBarPosition::START;
FireChangeEvent(sideBarStatus_ == SideBarStatus::HIDDEN);
if (sideBarStatus_ == SideBarStatus::HIDDEN) {
controller_->AddInterpolator(isSideBarStart ? leftToRightAnimation_ : rightToLeftAnimation_);
controller_->AddStopListener([weak]() {
auto pattern = weak.Upgrade();
CHECK_NULL_VOID_NOLOG(pattern);
pattern->SetSideBarStatus(SideBarStatus::SHOW);
pattern->FireChangeEvent(true);
pattern->UpdateControlButtonIcon();
});
} else {
@ -383,7 +384,6 @@ void SideBarContainerPattern::DoSideBarAnimation()
auto pattern = weak.Upgrade();
CHECK_NULL_VOID_NOLOG(pattern);
pattern->SetSideBarStatus(SideBarStatus::HIDDEN);
pattern->FireChangeEvent(false);
pattern->UpdateControlButtonIcon();
});
}