openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2025-02-21 21:23:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!45696 修复高负载场景下长按多选拖拽无法触发的问题

Browse Source 
Merge pull request !45696 from Zenix/fixTouchMultiPanNotTrigger
This commit is contained in:
openharmony_ci 2024-10-17 10:38:39 +00:00 committed by Gitee
commit 4e1d802d9d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frameworks/core/components_ng/event/drag_event.cpp
View File

@ -797,6 +797,7 @@ void DragEventActuator::OnCollectTouchTarget(const OffsetF& coordinateOffset, co
SequencedRecognizer_->SetCoordinateOffset(Offset(coordinateOffset.GetX(), coordinateOffset.GetY()));
SequencedRecognizer_->SetOnActionCancel(actionCancel);
SequencedRecognizer_->SetGetEventTargetImpl(getEventTargetImpl);
SequencedRecognizer_->SetIsEventHandoverNeeded(true);
result.emplace_back(SequencedRecognizer_);
result.emplace_back(previewLongPressRecognizer_);
}

3
frameworks/core/components_ng/gestures/recognizers/sequenced_recognizer.cpp
View File

@ -235,7 +235,8 @@ void SequencedRecognizer::UpdateCurrentIndex()
}
currentIndex_++;
// if the sequence recognizer between long press recognizer, auto send to next event.
if (inputEventType_ == InputEventType::MOUSE_BUTTON && CheckBetweenTwoLongPressRecognizer(currentIndex_)) {
if (isEventHandoverNeeded_ ||
(inputEventType_ == InputEventType::MOUSE_BUTTON && CheckBetweenTwoLongPressRecognizer(currentIndex_))) {
auto duration = 0;
auto iter = recognizers_.begin();
std::advance(iter, currentIndex_ - 1);

5
frameworks/core/components_ng/gestures/recognizers/sequenced_recognizer.h
View File

@ -48,6 +48,10 @@ public:
void CleanRecognizerState() override;
void ForceCleanRecognizer() override;
void SetIsEventHandoverNeeded(bool isEventHandoverNeeded)
{
isEventHandoverNeeded_ = isEventHandoverNeeded;
}
private:
void HandleTouchDownEvent(const TouchEvent& event) override {};
@ -65,6 +69,7 @@ private:
void SendTouchEventToNextRecognizer(const RefPtr<NGGestureRecognizer> curRecognizer, int64_t beforeDuration = 0);
bool CheckBetweenTwoLongPressRecognizer(int32_t currentIndex = 0);
bool isEventHandoverNeeded_ = false;
int32_t currentIndex_ = 0;
AxisEvent lastAxisEvent_;
std::list<std::string> childTouchTestList_;