a11y atspi: Map checkable and hasPopup states to AT-SPI

These states have direct equivalents in AT-SPI, so map them
accordingly.

Fixes: QTBUG-119080
Pick-to: 6.6
Change-Id: I5a78a75d135a853b3773c34aa2a45c0791cefebc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit b2ec2e1137ceb0b83978a7fa35485b1b97c73648)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Michael Weghorn 2023-12-11 16:56:29 +01:00 committed by Qt Cherry-pick Bot
parent 40425a35ca
commit e9c11ba22a

View File

@ -36,6 +36,8 @@ quint64 spiStatesFromQState(QAccessible::State state)
setSpiStateBit(&spiState, ATSPI_STATE_FOCUSED); setSpiStateBit(&spiState, ATSPI_STATE_FOCUSED);
if (state.pressed) if (state.pressed)
setSpiStateBit(&spiState, ATSPI_STATE_PRESSED); setSpiStateBit(&spiState, ATSPI_STATE_PRESSED);
if (state.checkable)
setSpiStateBit(&spiState, ATSPI_STATE_CHECKABLE);
if (state.checked) if (state.checked)
setSpiStateBit(&spiState, ATSPI_STATE_CHECKED); setSpiStateBit(&spiState, ATSPI_STATE_CHECKED);
if (state.checkStateMixed) if (state.checkStateMixed)
@ -75,7 +77,8 @@ quint64 spiStatesFromQState(QAccessible::State state)
if (state.extSelectable) if (state.extSelectable)
setSpiStateBit(&spiState, ATSPI_STATE_SELECTABLE); setSpiStateBit(&spiState, ATSPI_STATE_SELECTABLE);
// if (state.Protected) // if (state.Protected)
// if (state.HasPopup) if (state.hasPopup)
setSpiStateBit(&spiState, ATSPI_STATE_HAS_POPUP);
if (state.modal) if (state.modal)
setSpiStateBit(&spiState, ATSPI_STATE_MODAL); setSpiStateBit(&spiState, ATSPI_STATE_MODAL);
if (state.multiLine) if (state.multiLine)