From 81e55fede783b3747998c98f2471d773805b9246 Mon Sep 17 00:00:00 2001 From: Morten Johan Sorvig Date: Thu, 12 Jan 2012 10:14:56 +0100 Subject: Improve accessibility actions descriptions on Mac Use built-in descriptions for built-in actions Change-Id: Ic5581e89e4568abcc6c3add126d492345d26d87d Reviewed-by: Frederik Gladhorn --- src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm index 830e6860b7..ceb60faf41 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm +++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm @@ -195,11 +195,12 @@ static QAccessibleInterface *acast(void *ptr) - (NSString *)accessibilityActionDescription:(NSString *)action { QAccessibleActionInterface *actionInterface = acast(accessibleInterface)->actionInterface(); - if (actionInterface) { - QString qtAction = QCocoaAccessible::translateAction(action); + QString qtAction = QCocoaAccessible::translateAction(action); + + // Return a description from the action interface if this action is not known to the OS. + if (qtAction.isEmpty()) { QString description = actionInterface->localizedActionDescription(qtAction); - if (!description.isEmpty()) - return qt_mac_QStringToNSString(description); + return qt_mac_QStringToNSString(description); } return NSAccessibilityActionDescription(action); -- cgit v1.2.3