QQuickScrollBar: set implicit Cursor as Qt::ArrowCursor

Scrollbar over TextArea had Qt::IBeamCursor, although the textarea would not be activated when clicked.

Task-number: QTBUG-59629
Change-Id: Ie96ba03360fcfb5872f5bb6345e168c987978aca
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

5 files changed, 173 insertions, 0 deletions

diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
index 3dcb720a..8f4337ae 100644
--- a/src/quicktemplates2/qquickscrollbar.cpp
+++ b/src/quicktemplates2/qquickscrollbar.cpp
@@ -274,6 +274,9 @@ QQuickScrollBar::QQuickScrollBar(QQuickItem *parent)
 {
     setKeepMouseGrab(true);
     setAcceptedMouseButtons(Qt::LeftButton);
+#if QT_CONFIG(cursor)
+    setCursor(Qt::ArrowCursor);
+#endif
 }
 
 QQuickScrollBarAttached *QQuickScrollBar::qmlAttachedProperties(QObject *object)
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 4dabf06f..6741296a 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -17,6 +17,7 @@ SUBDIRS += \
     qquickuniversalstyleconf \
     revisions \
     sanity \
+    scrollbar \
     snippets
 
 # QTBUG-50295
diff --git a/tests/auto/scrollbar/data/cursor.qml b/tests/auto/scrollbar/data/cursor.qml
new file mode 100644
index 00000000..01dcd2ae
--- /dev/null
+++ b/tests/auto/scrollbar/data/cursor.qml
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.6
+import QtQuick.Controls 2.0
+
+ApplicationWindow {
+    width: 400
+    height: 400
+
+    property alias textArea: textArea
+    property alias scrollBar: scrollBar
+
+    Flickable {
+        anchors.fill: parent
+        TextArea.flickable: TextArea {
+            id: textArea
+        }
+        ScrollBar.vertical: ScrollBar {
+            id: scrollBar
+        }
+    }
+}
diff --git a/tests/auto/scrollbar/scrollbar.pro b/tests/auto/scrollbar/scrollbar.pro
new file mode 100644
index 00000000..03e11d44
--- /dev/null
+++ b/tests/auto/scrollbar/scrollbar.pro
@@ -0,0 +1,14 @@
+CONFIG += testcase
+TARGET = tst_scrollbar
+SOURCES += tst_scrollbar.cpp
+
+macos:CONFIG -= app_bundle
+
+QT += core-private gui-private qml-private quick-private testlib quicktemplates2-private
+
+include (../shared/util.pri)
+
+TESTDATA = data/*
+
+OTHER_FILES += \
+    data/*.qml
diff --git a/tests/auto/scrollbar/tst_scrollbar.cpp b/tests/auto/scrollbar/tst_scrollbar.cpp
new file mode 100644
index 00000000..741a6edc
--- /dev/null
+++ b/tests/auto/scrollbar/tst_scrollbar.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/qtest.h>
+#include "../shared/visualtestutil.h"
+
+#include <QtQuickTemplates2/private/qquickapplicationwindow_p.h>
+#include <QtQuickTemplates2/private/qquickscrollbar_p.h>
+#include <QtQuickTemplates2/private/qquicktextarea_p.h>
+
+using namespace QQuickVisualTestUtil;
+
+class tst_scrollbar : public QQmlDataTest
+{
+    Q_OBJECT
+
+private slots:
+    void cursorShape();
+};
+
+// QTBUG-59629
+void tst_scrollbar::cursorShape()
+{
+    // Ensure that the mouse cursor has the correct shape when over a scrollbar
+    // which is itself over a text area with IBeamCursor.
+    QQuickApplicationHelper helper(this, QStringLiteral("cursor.qml"));
+    QQuickApplicationWindow *window = helper.appWindow;
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
+
+    QQuickScrollBar *scrollBar = helper.appWindow->property("scrollBar").value<QQuickScrollBar*>();
+    QVERIFY(scrollBar);
+
+    QQuickTextArea *textArea = helper.appWindow->property("textArea").value<QQuickTextArea*>();
+    QVERIFY(textArea);
+
+    textArea->setText(QString("\n").repeated(100));
+
+    const QPoint textAreaPos(window->width() / 2, window->height() / 2);
+    QTest::mouseMove(window, textAreaPos);
+    QCOMPARE(window->cursor().shape(), textArea->cursor().shape());
+
+    const QPoint scrollBarPos(window->width() - scrollBar->width() / 2, window->height() / 2);
+    QTest::mouseMove(window, scrollBarPos);
+    QVERIFY(scrollBar->isActive());
+    QCOMPARE(window->cursor().shape(), scrollBar->cursor().shape());
+    QCOMPARE(scrollBar->cursor().shape(), Qt::CursorShape::ArrowCursor);
+}
+
+QTEST_MAIN(tst_scrollbar)
+
+#include "tst_scrollbar.moc"