From ba888bb8c8e6fce76efc855ef81250f2c9426b40 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 5 Jan 2012 18:03:04 +0100 Subject: Clean up and extend QAccessible::State. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The state should contain useful and clear information. Some of the old enum/bitfield members were not really clear. Make them follow Qt terminology and shift the burden of interpreting them to the bridge. Apart from the previous commit changing from enum to bitfield, these flags have changed names: unavailable -> disabled mixed -> checkStateMixed protected -> passwordEdit (in the last commit) floating is completely removed, even MSAA documentation states it is unsupported. Some new states have been added. Documentation added. Change-Id: I152256e77a061f28ee5780f527524c80a2c7e333 Reviewed-by: Jan-Arve Sæther --- src/plugins/accessible/widgets/qaccessiblemenu.cpp | 2 +- src/plugins/accessible/widgets/qaccessiblewidgets.cpp | 4 ++-- src/plugins/accessible/widgets/simplewidgets.cpp | 2 +- src/plugins/platforms/windows/qwindowsaccessibility.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp index 77157d1b62..fcd118e745 100644 --- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp +++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp @@ -273,7 +273,7 @@ QAccessible::State QAccessibleMenuItem::state() const if (own->style()->styleHint(QStyle::SH_Menu_MouseTracking)) s.hotTracked = true; if (m_action->isSeparator() || !m_action->isEnabled()) - s.unavailable = true; + s.disabled = true; if (m_action->isChecked()) s.checked = true; diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp index bb744232f4..ffd87dd834 100644 --- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp +++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp @@ -714,7 +714,7 @@ QAccessible::State QAccessibleMdiSubWindow::state() const if (!mdiSubWindow()->parentWidget()->contentsRect().contains(mdiSubWindow()->geometry())) state.offscreen = true; if (!mdiSubWindow()->isEnabled()) - state.unavailable = true; + state.disabled = true; return state; } @@ -1035,7 +1035,7 @@ QAccessible::State QAccessibleTitleBar::state() const if (w->hasFocus()) state.focused = true; if (!w->isEnabled()) - state.unavailable = true; + state.disabled = true; return state; } diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp index 74e9645693..d645ad2d22 100644 --- a/src/plugins/accessible/widgets/simplewidgets.cpp +++ b/src/plugins/accessible/widgets/simplewidgets.cpp @@ -142,7 +142,7 @@ QAccessible::State QAccessibleButton::state() const if (b->isChecked()) state.checked = true; else if (cb && cb->checkState() == Qt::PartiallyChecked) - state.mixed = true; + state.checkStateMixed = true; if (b->isDown()) state.pressed = true; QPushButton *pb = qobject_cast(b); diff --git a/src/plugins/platforms/windows/qwindowsaccessibility.cpp b/src/plugins/platforms/windows/qwindowsaccessibility.cpp index 4de4294e8f..fdf6c9116e 100644 --- a/src/plugins/platforms/windows/qwindowsaccessibility.cpp +++ b/src/plugins/platforms/windows/qwindowsaccessibility.cpp @@ -1093,7 +1093,7 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::get_accState(VARIANT varID, VARIAN st |= STATE_SYSTEM_LINKED; if (state.marqueed) st |= STATE_SYSTEM_MARQUEED; - if (state.mixed) + if (state.checkStateMixed) st |= STATE_SYSTEM_MIXED; if (state.movable) st |= STATE_SYSTEM_MOVEABLE; -- cgit v1.2.3