openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-23 15:10:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!38348 修复listtiem节点下树依然能滑动的问题

Browse Source 
Merge pull request !38348 from 石红杰/0720
This commit is contained in:
openharmony_ci 2024-07-20 14:49:38 +00:00 committed by Gitee
commit bd7932166a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frameworks/core/components_ng/pattern/list/list_item_pattern.cpp
View File

@ -153,7 +153,7 @@ void ListItemPattern::SetStartNode(const RefPtr<NG::UINode>& startNode)
host->MarkDirtyNode(PROPERTY_UPDATE_BY_CHILD_REQUEST);
}
} else if (HasStartNode()) {
if (Positive(curOffset_)) {
if (NonNegative(curOffset_)) {
curOffset_ = 0.0f;
isDragging_ = false;
}
@ -188,7 +188,7 @@ void ListItemPattern::SetEndNode(const RefPtr<NG::UINode>& endNode)
host->MarkDirtyNode(PROPERTY_UPDATE_BY_CHILD_REQUEST);
}
} else if (HasEndNode()) {
if (Negative(curOffset_)) {
if (NonPositive(curOffset_)) {
curOffset_ = 0.0f;
isDragging_ = false;
}
@ -352,7 +352,6 @@ void ListItemPattern::InitSwiperAction(bool axisChanged)
auto weak = AceType::WeakClaim(this);
auto actionStartTask = [weak](const GestureEvent& info) {
auto pattern = weak.Upgrade();
pattern->isDragging_ = true;
CHECK_NULL_VOID(pattern);
auto frameNode = pattern->GetListFrameNode();
CHECK_NULL_VOID(frameNode);
@ -379,13 +378,12 @@ void ListItemPattern::InitSwiperAction(bool axisChanged)
auto actionEndTask = [weak](const GestureEvent& info) {
auto pattern = weak.Upgrade();
pattern->isDragging_ = false;
CHECK_NULL_VOID(pattern);
auto frameNode = pattern->GetListFrameNode();
CHECK_NULL_VOID(frameNode);
auto listPattern = frameNode->GetPattern<ListPattern>();
CHECK_NULL_VOID(listPattern);
if (!listPattern->IsCurrentSwiperItem(weak)) {
if (!listPattern->IsCurrentSwiperItem(weak) || !pattern->isDragging_) {
return;
}
pattern->HandleDragEnd(info);
@ -393,13 +391,12 @@ void ListItemPattern::InitSwiperAction(bool axisChanged)
auto actionCancelTask = [weak]() {
auto pattern = weak.Upgrade();
pattern->isDragging_ = false;
CHECK_NULL_VOID(pattern);
auto frameNode = pattern->GetListFrameNode();
CHECK_NULL_VOID(frameNode);
auto listPattern = frameNode->GetPattern<ListPattern>();
CHECK_NULL_VOID(listPattern);
if (!listPattern->IsCurrentSwiperItem(weak)) {
if (!listPattern->IsCurrentSwiperItem(weak) || !pattern->isDragging_) {
return;
}
GestureEvent info;
@ -444,6 +441,7 @@ void ListItemPattern::HandleDragStart(const GestureEvent& info)
springController_->ClearStopListeners();
springController_->Stop();
}
isDragging_ = true;
SetSwiperItemForList();
}
@ -781,6 +779,7 @@ void ListItemPattern::HandleDragEnd(const GestureEvent& info)
float velocity = IsRTLAndVertical() ? -info.GetMainVelocity() : info.GetMainVelocity();
bool reachRightSpeed = velocity > SWIPER_SPEED_TH;
bool reachLeftSpeed = -velocity > SWIPER_SPEED_TH;
isDragging_ = false;
TAG_LOGI(AceLogTag::ACE_LIST, "ListItem HandleDragEnd, velocity:%{public}f, curPos:%{public}f",
velocity, curOffset_);