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

!38221 修复无障碍手势事件不触发问题

Browse Source 
Merge pull request !38221 from wlh2624/0807
This commit is contained in:
openharmony_ci 2024-07-20 13:45:25 +00:00 committed by Gitee
commit 4f3d1ee050
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 54 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
frameworks/core/components_ng/event/gesture_event_hub.cpp
View File

@ -1310,6 +1310,46 @@ OnAccessibilityEventFunc GestureEventHub::GetOnAccessibilityEventFunc()
return callback;
}
template<typename T>
const RefPtr<T> GestureEventHub::AccessibilityRecursionSearchRecognizer(const RefPtr<NGGestureRecognizer>& recognizer)
{
auto CheckRecognizer = [](const RefPtr<NGGestureRecognizer>& recognizer) {
const auto re = AceType::DynamicCast<ClickRecognizer>(recognizer);
if (re != nullptr && re->GetFingers() == 1 && re->GetCount() == 1) {
return true;
} else if (AceType::DynamicCast<LongPressRecognizer>(recognizer) != nullptr &&
AceType::DynamicCast<LongPressRecognizer>(recognizer)->GetFingers() == 1) {
return true;
}
return false;
};
const auto re = AceType::DynamicCast<T>(recognizer);
if (re != nullptr && CheckRecognizer(recognizer)) {
return re;
} else if (AceType::DynamicCast<RecognizerGroup>(recognizer) != nullptr) {
for (const auto& recognizerElement : AceType::DynamicCast<RecognizerGroup>(recognizer)->GetGroupRecognizer()) {
const auto& tmpRecognizer = AccessibilityRecursionSearchRecognizer<T>(recognizerElement);
if (tmpRecognizer != nullptr) {
return tmpRecognizer;
}
}
}
return nullptr;
}
template<typename T>
const RefPtr<T> GestureEventHub::GetAccessibilityRecognizer()
{
for (const auto& recognizer : gestureHierarchy_) {
const auto& re = AccessibilityRecursionSearchRecognizer<T>(recognizer);
if (re != nullptr) {
return re;
}
}
return nullptr;
}
bool GestureEventHub::ActClick(std::shared_ptr<JsonValue> secComphandle)
{
auto host = GetFrameNode();
@ -1342,15 +1382,12 @@ bool GestureEventHub::ActClick(std::shared_ptr<JsonValue> secComphandle)
click(info);
return true;
}
RefPtr<ClickRecognizer> clickRecognizer;
for (auto gestureRecognizer : gestureHierarchy_) {
clickRecognizer = AceType::DynamicCast<ClickRecognizer>(gestureRecognizer);
if (clickRecognizer && clickRecognizer->GetFingers() == 1 && clickRecognizer->GetCount() == 1) {
click = clickRecognizer->GetTapActionFunc();
click(info);
host->OnAccessibilityEvent(AccessibilityEventType::CLICK);
return true;
}
const RefPtr<ClickRecognizer> clickRecognizer = GetAccessibilityRecognizer<ClickRecognizer>();
if (clickRecognizer) {
click = clickRecognizer->GetTapActionFunc();
click(info);
host->OnAccessibilityEvent(AccessibilityEventType::CLICK);
return true;
}
return false;
}
@ -1484,28 +1521,12 @@ OnDragCallbackCore GestureEventHub::GetDragCallback(const RefPtr<PipelineBase>&
bool GestureEventHub::IsAccessibilityClickable()
{
bool ret = IsClickable();
RefPtr<ClickRecognizer> clickRecognizer;
for (auto gestureRecognizer : gestureHierarchy_) {
clickRecognizer = AceType::DynamicCast<ClickRecognizer>(gestureRecognizer);
if (clickRecognizer && clickRecognizer->GetFingers() == 1 && clickRecognizer->GetCount() == 1) {
return true;
}
}
return ret;
return IsClickable() || GetAccessibilityRecognizer<ClickRecognizer>() != nullptr;
}
bool GestureEventHub::IsAccessibilityLongClickable()
{
bool ret = IsLongClickable();
RefPtr<LongPressRecognizer> longPressRecognizer;
for (auto gestureRecognizer : gestureHierarchy_) {
longPressRecognizer = AceType::DynamicCast<LongPressRecognizer>(gestureRecognizer);
if (longPressRecognizer && longPressRecognizer->GetFingers() == 1) {
return true;
}
}
return ret;
return IsLongClickable() || GetAccessibilityRecognizer<LongPressRecognizer>() != nullptr;
}
bool GestureEventHub::GetMonopolizeEvents() const

6
frameworks/core/components_ng/event/gesture_event_hub.h
View File

@ -708,6 +708,12 @@ private:
void UpdateExtraInfo(const RefPtr<FrameNode>& frameNode, std::unique_ptr<JsonValue>& arkExtraInfoJson,
float scale);
template<typename T>
const RefPtr<T> GetAccessibilityRecognizer();
template<typename T>
const RefPtr<T> AccessibilityRecursionSearchRecognizer(const RefPtr<NGGestureRecognizer>& recognizer);
WeakPtr<EventHub> eventHub_;
RefPtr<ScrollableActuator> scrollableActuator_;
RefPtr<TouchEventActuator> touchEventActuator_;