From ecd41111a3a7100f20e72b811b1010bc45e94127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20de=20la=20Rocha?= Date: Wed, 25 May 2022 14:56:02 +0200 Subject: Add ExpandCollapse UI Automation pattern to combo boxes Also add support to expandable/expanded states to QAccessibleComboBox in widgets. QtDeclarative will still require updates so that QML combo boxes report the expanded/collapsed state and react to UIA actions. Task-number: QTBUG-103591 Pick-to: 6.4 6.3 Change-Id: Iff8ba5e3143778ce17998dbe7f5f76cae658dc19 Reviewed-by: Volker Hilsheimer --- src/widgets/accessible/complexwidgets.cpp | 10 ++++++++++ src/widgets/accessible/complexwidgets_p.h | 2 ++ 2 files changed, 12 insertions(+) (limited to 'src/widgets') diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index 6a3dedc162..3d5154a30f 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -350,6 +350,16 @@ QString QAccessibleComboBox::text(QAccessible::Text t) const return str; } +QAccessible::State QAccessibleComboBox::state() const +{ + QAccessible::State s = QAccessibleWidget::state(); + + s.expandable = true; + s.expanded = isValid() && comboBox()->view()->isVisible(); + + return s; +} + QStringList QAccessibleComboBox::actionNames() const { return QStringList() << showMenuAction() << pressAction(); diff --git a/src/widgets/accessible/complexwidgets_p.h b/src/widgets/accessible/complexwidgets_p.h index 65d995d933..1fd5d5aeeb 100644 --- a/src/widgets/accessible/complexwidgets_p.h +++ b/src/widgets/accessible/complexwidgets_p.h @@ -102,6 +102,8 @@ public: QString text(QAccessible::Text t) const override; + QAccessible::State state() const override; + // QAccessibleActionInterface QStringList actionNames() const override; QString localizedActionDescription(const QString &actionName) const override; -- cgit v1.2.3