Don't overwrite states if role is assigned after a state

We therefore need to keep track of which states have been explicitly set
or not in order to know which ones should get initialized with their
defaults.

Change-Id: I49fdae82288f04ea4f50d45735a93434ac02abec
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

4 files changed, 82 insertions, 36 deletions

diff --git a/src/quick/items/qquickaccessibleattached.cpp b/src/quick/items/qquickaccessibleattached.cpp
index 0168c3160c..c150e4efa2 100644
--- a/src/quick/items/qquickaccessibleattached.cpp
+++ b/src/quick/items/qquickaccessibleattached.cpp
@@ -390,6 +390,49 @@ QQuickAccessibleAttached::~QQuickAccessibleAttached()
 {
 }
 
+void QQuickAccessibleAttached::setRole(QAccessible::Role role)
+{
+    if (role != m_role) {
+        m_role = role;
+        Q_EMIT roleChanged();
+        // There is no way to signify role changes at the moment.
+        // QAccessible::updateAccessibility(parent(), 0, QAccessible::);
+
+        switch (role) {
+        case QAccessible::CheckBox:
+        case QAccessible::RadioButton:
+            if (!m_stateExplicitlySet.focusable)
+                m_state.focusable = true;
+            if (!m_stateExplicitlySet.checkable)
+                m_state.checkable = true;
+            break;
+        case QAccessible::Button:
+        case QAccessible::MenuItem:
+        case QAccessible::PageTab:
+        case QAccessible::SpinBox:
+        case QAccessible::ComboBox:
+        case QAccessible::Terminal:
+        case QAccessible::ScrollBar:
+            if (!m_stateExplicitlySet.focusable)
+                m_state.focusable = true;
+            break;
+        case QAccessible::EditableText:
+            if (!m_stateExplicitlySet.editable)
+                m_state.editable = true;
+            if (!m_stateExplicitlySet.focusable)
+                m_state.focusable = true;
+            break;
+        case QAccessible::StaticText:
+            if (!m_stateExplicitlySet.readOnly) {
+                m_state.readOnly = true;
+            }
+            break;
+        default:
+            break;
+        }
+    }
+}
+
 QQuickAccessibleAttached *QQuickAccessibleAttached::qmlAttachedProperties(QObject *obj)
 {
     return new QQuickAccessibleAttached(obj);
diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h
index e292c280df..f4194ef13d 100644
--- a/src/quick/items/qquickaccessibleattached_p.h
+++ b/src/quick/items/qquickaccessibleattached_p.h
@@ -69,6 +69,7 @@ QT_BEGIN_NAMESPACE
     bool P() const { return m_state.P ; } \
     void set_ ## P(bool arg) \
     { \
+        m_stateExplicitlySet.P = true; \
         if (m_state.P == arg) \
             return; \
         m_state.P = arg; \
@@ -111,41 +112,7 @@ public:
     ~QQuickAccessibleAttached();
 
     QAccessible::Role role() const { return m_role; }
-    void setRole(QAccessible::Role role)
-    {
-        if (role != m_role) {
-            m_role = role;
-            Q_EMIT roleChanged();
-            // There is no way to signify role changes at the moment.
-            // QAccessible::updateAccessibility(parent(), 0, QAccessible::);
-
-            switch (role) {
-            case QAccessible::CheckBox:
-            case QAccessible::RadioButton:
-                m_state.focusable = true;
-                m_state.checkable = true;
-                break;
-            case QAccessible::Button:
-            case QAccessible::MenuItem:
-            case QAccessible::PageTab:
-            case QAccessible::SpinBox:
-            case QAccessible::ComboBox:
-            case QAccessible::Terminal:
-            case QAccessible::ScrollBar:
-                m_state.focusable = true;
-                break;
-            case QAccessible::EditableText:
-                m_state.editable = true;
-                m_state.focusable = true;
-                break;
-            case QAccessible::StaticText:
-                m_state.readOnly = true;
-                break;
-            default:
-                break;
-            }
-        }
-    }
+    void setRole(QAccessible::Role role);
     QString name() const {
         if (m_state.passwordEdit)
             return QString();
@@ -247,6 +214,7 @@ private:
 
     QAccessible::Role m_role;
     QAccessible::State m_state;
+    QAccessible::State m_stateExplicitlySet;
     QString m_name;
     QString m_description;
 
diff --git a/tests/auto/quick/qquickaccessible/data/text.qml b/tests/auto/quick/qquickaccessible/data/text.qml
index 88f292a61f..6daeacfd81 100644
--- a/tests/auto/quick/qquickaccessible/data/text.qml
+++ b/tests/auto/quick/qquickaccessible/data/text.qml
@@ -46,4 +46,15 @@ Item {
         text: "A multi-line text edit\nTesting Accessibility."
         Accessible.role: Accessible.EditableText
     }
+
+    Text {
+        x: 100
+        y: 160
+        width: 100
+        height: 40
+        text : "Hello 3"
+        Accessible.name: text
+        Accessible.description: "description"
+    }
+
 }
diff --git a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
index 243d87f212..c5fdb6c1b9 100644
--- a/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
+++ b/tests/auto/quick/qquickaccessible/tst_qquickaccessible.cpp
@@ -312,7 +312,7 @@ void tst_QQuickAccessible::basicPropertiesTest()
 
     QAccessibleInterface *item = iface->child(0);
     QVERIFY(item);
-    QCOMPARE(item->childCount(), 4);
+    QCOMPARE(item->childCount(), 5);
     QCOMPARE(item->rect().size(), QSize(400, 400));
     QCOMPARE(item->role(), QAccessible::Client);
     QCOMPARE(iface->indexOfChild(item), 0);
@@ -382,6 +382,30 @@ void tst_QQuickAccessible::basicPropertiesTest()
     QEXPECT_FAIL("", "multi line is not implemented", Continue);
     QCOMPARE(textInput->state().multiLine, 1);
 
+    // Text "Hello 3"
+    QAccessibleInterface *text3 = item->child(4);
+    QVERIFY(text3);
+    QCOMPARE(text3->childCount(), 0);
+    QCOMPARE(text3->text(QAccessible::Name), QLatin1String("Hello 3"));
+    QCOMPARE(text3->role(), QAccessible::StaticText);
+    QCOMPARE(item->indexOfChild(text3), 4);
+    QCOMPARE(text3->state().editable, 0);
+    QCOMPARE(text3->state().readOnly, 0);
+    // test implicit state values due to role change
+    QQuickAccessibleAttached *attached = QQuickAccessibleAttached::attachedProperties(text3->object());
+    attached->setRole(QAccessible::StaticText);
+    QCOMPARE(text3->role(), QAccessible::StaticText);
+    QCOMPARE(text3->state().readOnly, 1);
+
+    // see if implicit changes back
+    attached->setRole(QAccessible::EditableText);
+    QEXPECT_FAIL("", "EditableText does not implicitly set readOnly to false", Continue);
+    QCOMPARE(text3->state().readOnly, 0);
+    // explicitly set state
+    attached->set_readOnly(false);
+    attached->setRole(QAccessible::StaticText);
+    QCOMPARE(text3->state().readOnly, 0);
+
     delete window;
     QTestAccessibility::clearEvents();
 }