From e02c6dd1d32b048f829153052259a6d097d7434b Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 7 Jun 2013 13:09:57 +0200 Subject: [PATCH] Mac Accessibility: skip invisible children Change-Id: I6c3da526ecef60447a658b6b5501282729e9c6f5 Reviewed-by: Gabriel de Dietrich --- src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm | 3 +++ src/plugins/platforms/cocoa/qnsviewaccessibility.mm | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm index 55a23fda761..5309bc2ac5c 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm +++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm @@ -145,6 +145,9 @@ for (int i = 0; i < numKids; ++i) { QAccessibleInterface *child = iface->child(i); Q_ASSERT(child); + if (child->state().invalid || child->state().invisible) + continue; + QAccessible::Id childId = QAccessible::uniqueId(child); //qDebug() << " kid: " << childId << child; QCocoaAccessibleElement *element = [QCocoaAccessibleElement createElementWithId:childId parent:self]; diff --git a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm index 331a66417d4..59e39e70c70 100644 --- a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm +++ b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm @@ -82,6 +82,9 @@ for (int i = 0; i < numKids; ++i) { QAccessibleInterface *child = m_window->accessibleRoot()->child(i); Q_ASSERT(child); + if (child->state().invalid || child->state().invisible) + continue; + QAccessible::Id childAxid = QAccessible::uniqueId(child); QCocoaAccessibleElement *element = [QCocoaAccessibleElement createElementWithId:childAxid parent:self]; [kids addObject: element];