diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:12:40 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:12:41 +0100 |
commit | 24e2b39e7a06687322a18a158a083eb51a7c0dca (patch) | |
tree | 1a32caf6dd6db74fbac9553a094bb00b216fa678 /src/plugins | |
parent | 39540124dd0900e0c99dcda8c0ebdf4f3cea8d5e (diff) | |
parent | daff5f2988cef31442629a48c3b3088abf01837a (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If9a205bea219b9aca95d78b1e556ca9bbff58dd0
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/accessible/quick/qaccessiblequickitem.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/plugins/accessible/quick/qaccessiblequickitem.cpp b/src/plugins/accessible/quick/qaccessiblequickitem.cpp index 12884ffa4f..9e8c2a6020 100644 --- a/src/plugins/accessible/quick/qaccessiblequickitem.cpp +++ b/src/plugins/accessible/quick/qaccessiblequickitem.cpp @@ -154,15 +154,21 @@ QAccessible::State QAccessibleQuickItem::state() const { QAccessible::State state; - if (item()->hasActiveFocus()) + if (item()->hasActiveFocus()) { + state.focusable = true; state.focused = true; + } + + if (item()->activeFocusOnTab()) + state.focusable = true; - if (!item()->window() ||!item()->isVisible() || qFuzzyIsNull(item()->opacity())) + if (!item()->window() || !item()->window()->isVisible() ||!item()->isVisible() || qFuzzyIsNull(item()->opacity())) state.invisible = true; QAccessible::Role r = role(); switch (r) { case QAccessible::Button: { + state.focusable = true; QVariant checkable = item()->property("checkable"); if (!checkable.toBool()) break; @@ -170,10 +176,20 @@ QAccessible::State QAccessibleQuickItem::state() const } case QAccessible::CheckBox: case QAccessible::RadioButton: { + state.focusable = true; state.checkable = true; state.checked = item()->property("checked").toBool(); break; } + case QAccessible::MenuItem: + case QAccessible::PageTab: + case QAccessible::EditableText: + case QAccessible::SpinBox: + case QAccessible::ComboBox: + case QAccessible::Terminal: + case QAccessible::ScrollBar: + state.focusable = true; + break; default: break; } |