From 5aa14793c422dc77f3b464c27091dcd1b2ed1c72 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 11 Oct 2011 16:20:47 +0200 Subject: Add default actions to QAccessibleWidget. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9f251aad663fd0b8db2ef068c6581241d91c090d Reviewed-by: Jan-Arve Sæther --- src/plugins/accessible/widgets/simplewidgets.cpp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'src/plugins/accessible/widgets/simplewidgets.cpp') diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp index 4771d93980..d2c5256b19 100644 --- a/src/plugins/accessible/widgets/simplewidgets.cpp +++ b/src/plugins/accessible/widgets/simplewidgets.cpp @@ -187,6 +187,7 @@ QStringList QAccessibleButton::actionNames() const break; } } + names << QAccessibleWidget::actionNames(); return names; } @@ -203,12 +204,13 @@ void QAccessibleButton::doAction(const QString &actionName) else #endif button()->animateClick(); - } - - if (actionName == CheckAction) + } else if (actionName == CheckAction) { button()->setChecked(true); - if (actionName == UncheckAction) + } else if (actionName == UncheckAction) { button()->setChecked(false); + } else { + QAccessibleWidget::doAction(actionName); + } } QStringList QAccessibleButton::keyBindingsForAction(const QString &actionName) const @@ -456,10 +458,10 @@ QAccessible::Relation QAccessibleDisplay::relationTo(int child, const QAccessibl #endif #ifndef QT_NO_GROUPBOX } else { - QGroupBox *groupbox = qobject_cast(object()); - if (groupbox && !groupbox->title().isEmpty()) - if (groupbox->children().contains(o)) - relation |= Label; + QGroupBox *groupbox = qobject_cast(object()); + if (groupbox && !groupbox->title().isEmpty()) + if (groupbox->children().contains(o)) + relation |= Label; #endif } return relation; @@ -478,9 +480,9 @@ int QAccessibleDisplay::navigate(RelationFlag rel, int entry, QAccessibleInterfa #endif #ifndef QT_NO_GROUPBOX } else { - QGroupBox *groupbox = qobject_cast(object()); - if (groupbox && !groupbox->title().isEmpty()) - rel = Child; + QGroupBox *groupbox = qobject_cast(object()); + if (groupbox && !groupbox->title().isEmpty()) + rel = Child; #endif } *target = QAccessible::queryAccessibleInterface(targetObject); -- cgit v1.2.3