1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accessibility Linux: Report Active state

Browse Source 
The fixme comment is invalid since QAccessibleWidget actually checks for
isWindow and sets the active state.
This is messed up because in Qt 4 there was a work-around to set active
for windows in a different code path.

[ChangeLog][QtGui] Accessibility on Linux now reports the active state
correctly.

Change-Id: I9e2cf436b3ffa7ef28286ee49d6e582f179930c6
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
This commit is contained in:
Frederik Gladhorn 2014-02-07 17:55:08 +01:00 committed by The Qt Project
parent c5042d68ea
commit 2a68cffa84
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/platformsupport/linuxaccessibility/atspiadaptor.cpp
View File

@ -1391,13 +1391,6 @@ bool AtSpiAdaptor::accessibleInterface(QAccessibleInterface *interface, const QS
if (interface->tableInterface()) { if (interface->tableInterface()) {
setSpiStateBit(&spiState, ATSPI_STATE_MANAGES_DESCENDANTS); setSpiStateBit(&spiState, ATSPI_STATE_MANAGES_DESCENDANTS);
} }
// FIXME: figure out if this is a top level window and set its active state accordingly
// if (interface->object() && interface->object()->isWidgetType()) {
// QWidget *w = qobject_cast<QWidget*>(interface->object());
// if (w->topLevelWidget() && w->isActiveWindow()) {
// setSpiStateBit(&spiState, ATSPI_STATE_ACTIVE);
// }
// }
QAccessible::Role role = interface->role(); QAccessible::Role role = interface->role();
if (role == QAccessible::TreeItem || if (role == QAccessible::TreeItem ||
role == QAccessible::ListItem) { role == QAccessible::ListItem) {

2
src/platformsupport/linuxaccessibility/constant_mappings.cpp
View File

@ -61,6 +61,8 @@ quint64 spiStatesFromQState(QAccessible::State state)
{ {
quint64 spiState = 0; quint64 spiState = 0;
if (state.active)
setSpiStateBit(&spiState, ATSPI_STATE_ACTIVE);
if (state.editable) if (state.editable)
setSpiStateBit(&spiState, ATSPI_STATE_EDITABLE); setSpiStateBit(&spiState, ATSPI_STATE_EDITABLE);
if (!state.disabled) { if (!state.disabled) {