Accessibility: QSpinBox should not have any children

On both iOS and Android it is very confusing to be able to move the focus to both, the line edit and the outer frame that is the spin box.
For Linux this fixes an issue that orca would not read the value correctly after pressing the up/down buttons.

Task-number: QTBUG-39861
Task-number: QTBUG-39442
Change-Id: I73c50c91e9021324c52d168d537afd0ea719a48f
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>

5 files changed, 160 insertions, 5 deletions

diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp
index 48f99f4d35..89fc988329 100644
--- a/src/widgets/accessible/qaccessiblewidget.cpp
+++ b/src/widgets/accessible/qaccessiblewidget.cpp
@@ -70,7 +70,8 @@ static QList<QWidget*> childWidgets(const QWidget *widget)
 #if !defined(QT_NO_MENU)
             && !qobject_cast<QMenu*>(w)
 #endif
-            && w->objectName() != QLatin1String("qt_rubberband"))
+            && w->objectName() != QLatin1String("qt_rubberband")
+            && w->objectName() != QLatin1String("qt_spinbox_lineedit"))
             widgets.append(w);
     }
     return widgets;
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
index 3d123cc9ab..fb81a4aaeb 100644
--- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp
+++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
@@ -66,7 +66,10 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
     if (false) {
 #ifndef QT_NO_LINEEDIT
     } else if (classname == QLatin1String("QLineEdit")) {
-        iface = new QAccessibleLineEdit(widget);
+        if (widget->objectName() == QLatin1String("qt_spinbox_lineedit"))
+            iface = 0;
+        else
+            iface = new QAccessibleLineEdit(widget);
 #endif
 #ifndef QT_NO_COMBOBOX
     } else if (classname == QLatin1String("QComboBox")) {
diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp
index d4dc74ea69..e16b99c25e 100644
--- a/src/widgets/accessible/rangecontrols.cpp
+++ b/src/widgets/accessible/rangecontrols.cpp
@@ -51,20 +51,28 @@
 #include <qglobal.h>
 #include <QDoubleSpinBox>
 #include <QDial>
+#include <QtWidgets/qlineedit.h>
 #include <qmath.h>
 #include <private/qmath_p.h>
 
+#include "simplewidgets.h" // let spinbox use line edit's interface
+
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_ACCESSIBILITY
 
 #ifndef QT_NO_SPINBOX
 QAccessibleAbstractSpinBox::QAccessibleAbstractSpinBox(QWidget *w)
-: QAccessibleWidget(w, QAccessible::SpinBox)
+: QAccessibleWidget(w, QAccessible::SpinBox), lineEdit(Q_NULLPTR)
 {
     Q_ASSERT(abstractSpinBox());
 }
 
+QAccessibleAbstractSpinBox::~QAccessibleAbstractSpinBox()
+{
+    delete lineEdit;
+}
+
 /*!
     Returns the underlying QAbstractSpinBox.
 */
@@ -73,6 +81,14 @@ QAbstractSpinBox *QAccessibleAbstractSpinBox::abstractSpinBox() const
     return qobject_cast<QAbstractSpinBox*>(object());
 }
 
+QAccessibleInterface *QAccessibleAbstractSpinBox::lineEditIface() const
+{
+    // QAccessibleLineEdit is only used to forward the text functions
+    if (!lineEdit)
+        lineEdit = new QAccessibleLineEdit(abstractSpinBox()->lineEdit());
+    return lineEdit;
+}
+
 QString QAccessibleAbstractSpinBox::text(QAccessible::Text t) const
 {
     if (t == QAccessible::Value)
@@ -84,6 +100,10 @@ void *QAccessibleAbstractSpinBox::interface_cast(QAccessible::InterfaceType t)
 {
     if (t == QAccessible::ValueInterface)
         return static_cast<QAccessibleValueInterface*>(this);
+    if (t == QAccessible::TextInterface)
+        return static_cast<QAccessibleTextInterface*>(this);
+    if (t == QAccessible::EditableTextInterface)
+        return static_cast<QAccessibleEditableTextInterface*>(this);
     return QAccessibleWidget::interface_cast(t);
 }
 
@@ -112,6 +132,102 @@ QVariant QAccessibleAbstractSpinBox::minimumStepSize() const
     return abstractSpinBox()->property("stepSize");
 }
 
+void QAccessibleAbstractSpinBox::addSelection(int startOffset, int endOffset)
+{
+    lineEditIface()->textInterface()->addSelection(startOffset, endOffset);
+}
+
+QString QAccessibleAbstractSpinBox::attributes(int offset, int *startOffset, int *endOffset) const
+{
+    return lineEditIface()->textInterface()->attributes(offset, startOffset, endOffset);
+}
+
+int QAccessibleAbstractSpinBox::cursorPosition() const
+{
+    return lineEditIface()->textInterface()->cursorPosition();
+}
+
+QRect QAccessibleAbstractSpinBox::characterRect(int offset) const
+{
+    return lineEditIface()->textInterface()->characterRect(offset);
+}
+
+int QAccessibleAbstractSpinBox::selectionCount() const
+{
+    return lineEditIface()->textInterface()->selectionCount();
+}
+
+int QAccessibleAbstractSpinBox::offsetAtPoint(const QPoint &point) const
+{
+    return lineEditIface()->textInterface()->offsetAtPoint(point);
+}
+
+void QAccessibleAbstractSpinBox::selection(int selectionIndex, int *startOffset, int *endOffset) const
+{
+    lineEditIface()->textInterface()->selection(selectionIndex, startOffset, endOffset);
+}
+
+QString QAccessibleAbstractSpinBox::text(int startOffset, int endOffset) const
+{
+    return lineEditIface()->textInterface()->text(startOffset, endOffset);
+}
+
+QString QAccessibleAbstractSpinBox::textBeforeOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const
+{
+    return lineEditIface()->textInterface()->textBeforeOffset(offset, boundaryType, startOffset, endOffset);
+}
+
+QString QAccessibleAbstractSpinBox::textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const
+{
+    return lineEditIface()->textInterface()->textAfterOffset(offset, boundaryType, startOffset, endOffset);
+}
+
+QString QAccessibleAbstractSpinBox::textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, int *startOffset, int *endOffset) const
+{
+    return lineEditIface()->textInterface()->textAtOffset(offset, boundaryType, startOffset, endOffset);
+}
+
+void QAccessibleAbstractSpinBox::removeSelection(int selectionIndex)
+{
+    lineEditIface()->textInterface()->removeSelection(selectionIndex);
+}
+
+void QAccessibleAbstractSpinBox::setCursorPosition(int position)
+{
+    lineEditIface()->textInterface()->setCursorPosition(position);
+}
+
+void QAccessibleAbstractSpinBox::setSelection(int selectionIndex, int startOffset, int endOffset)
+{
+    lineEditIface()->textInterface()->setSelection(selectionIndex, startOffset, endOffset);
+}
+
+int QAccessibleAbstractSpinBox::characterCount() const
+{
+    return lineEditIface()->textInterface()->characterCount();
+}
+
+void QAccessibleAbstractSpinBox::scrollToSubstring(int startIndex, int endIndex)
+{
+    lineEditIface()->textInterface()->scrollToSubstring(startIndex, endIndex);
+}
+
+void QAccessibleAbstractSpinBox::deleteText(int startOffset, int endOffset)
+{
+    lineEditIface()->editableTextInterface()->deleteText(startOffset, endOffset);
+}
+
+void QAccessibleAbstractSpinBox::insertText(int offset, const QString &text)
+{
+    lineEditIface()->editableTextInterface()->insertText(offset, text);
+}
+
+void QAccessibleAbstractSpinBox::replaceText(int startOffset, int endOffset, const QString &text)
+{
+    lineEditIface()->editableTextInterface()->replaceText(startOffset, endOffset, text);
+}
+
+
 /*!
   \class QAccessibleSpinBox
   \brief The QAccessibleSpinBox class implements the QAccessibleInterface for spinbox widgets.
diff --git a/src/widgets/accessible/rangecontrols.h b/src/widgets/accessible/rangecontrols.h
index 98cef46c5c..158e1cfcc0 100644
--- a/src/widgets/accessible/rangecontrols.h
+++ b/src/widgets/accessible/rangecontrols.h
@@ -55,12 +55,18 @@ class QSlider;
 class QSpinBox;
 class QDoubleSpinBox;
 class QDial;
+class QAccessibleLineEdit;
 
 #ifndef QT_NO_SPINBOX
-class QAccessibleAbstractSpinBox: public QAccessibleWidget, public QAccessibleValueInterface // TODO, public QAccessibleActionInterface
+class QAccessibleAbstractSpinBox:
+        public QAccessibleWidget,
+        public QAccessibleValueInterface,
+        public QAccessibleTextInterface,
+        public QAccessibleEditableTextInterface
 {
 public:
     explicit QAccessibleAbstractSpinBox(QWidget *w);
+    virtual ~QAccessibleAbstractSpinBox();
 
     QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
     void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
@@ -72,10 +78,37 @@ public:
     QVariant minimumValue() const Q_DECL_OVERRIDE;
     QVariant minimumStepSize() const Q_DECL_OVERRIDE;
 
-    // FIXME Action interface
+    // QAccessibleTextInterface
+    void addSelection(int startOffset, int endOffset) Q_DECL_OVERRIDE;
+    QString attributes(int offset, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
+    int cursorPosition() const Q_DECL_OVERRIDE;
+    QRect characterRect(int offset) const Q_DECL_OVERRIDE;
+    int selectionCount() const Q_DECL_OVERRIDE;
+    int offsetAtPoint(const QPoint &point) const Q_DECL_OVERRIDE;
+    void selection(int selectionIndex, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
+    QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE;
+    QString textBeforeOffset (int offset, QAccessible::TextBoundaryType boundaryType,
+            int *endOffset, int *startOffset) const Q_DECL_OVERRIDE;
+    QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType,
+            int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
+    QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType,
+            int *startOffset, int *endOffset) const Q_DECL_OVERRIDE;
+    void removeSelection(int selectionIndex) Q_DECL_OVERRIDE;
+    void setCursorPosition(int position) Q_DECL_OVERRIDE;
+    void setSelection(int selectionIndex, int startOffset, int endOffset) Q_DECL_OVERRIDE;
+    int characterCount() const Q_DECL_OVERRIDE;
+    void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE;
+
+    // QAccessibleEditableTextInterface
+    void deleteText(int startOffset, int endOffset) Q_DECL_OVERRIDE;
+    void insertText(int offset, const QString &text) Q_DECL_OVERRIDE;
+    void replaceText(int startOffset, int endOffset, const QString &text) Q_DECL_OVERRIDE;
 
 protected:
     QAbstractSpinBox *abstractSpinBox() const;
+    QAccessibleInterface *lineEditIface() const;
+private:
+    mutable QAccessibleLineEdit *lineEdit;
 };
 
 class QAccessibleSpinBox : public QAccessibleAbstractSpinBox
@@ -94,6 +127,7 @@ public:
 
     QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
 
+    using QAccessibleAbstractSpinBox::text;
 protected:
     QDoubleSpinBox *doubleSpinBox() const;
 };
diff --git a/src/widgets/accessible/simplewidgets.h b/src/widgets/accessible/simplewidgets.h
index e4ce6150e2..7dce0b3589 100644
--- a/src/widgets/accessible/simplewidgets.h
+++ b/src/widgets/accessible/simplewidgets.h
@@ -174,6 +174,7 @@ public:
     void replaceText(int startOffset, int endOffset, const QString &text) Q_DECL_OVERRIDE;
 protected:
     QLineEdit *lineEdit() const;
+    friend class QAccessibleAbstractSpinBox;
 };
 #endif // QT_NO_LINEEDIT