From d12cc4f6b58ecb5f44458002fe9b74d0c84f10ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= <jan-arve.saether@qt.io>
Date: Tue, 7 May 2019 14:58:29 +0200
Subject: 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>
---
 src/quick/items/qquickaccessibleattached.cpp | 43 ++++++++++++++++++++++++++++
 src/quick/items/qquickaccessibleattached_p.h | 38 ++----------------------
 2 files changed, 46 insertions(+), 35 deletions(-)

(limited to 'src/quick/items')

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;
 
-- 
cgit v1.2.3