Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I88990095b97a4088f9fda6c9496fd69d4556f6a1

7 files changed, 67 insertions, 31 deletions

diff --git a/src/imports/controls/material/RangeSlider.qml b/src/imports/controls/material/RangeSlider.qml
index d735573a..f05601a7 100644
--- a/src/imports/controls/material/RangeSlider.qml
+++ b/src/imports/controls/material/RangeSlider.qml
@@ -36,6 +36,7 @@
 
 import QtQuick 2.12
 import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.impl 2.12
 import QtQuick.Controls.Material 2.12
 import QtQuick.Controls.Material.impl 2.12
 
@@ -74,18 +75,18 @@ T.RangeSlider {
         y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : 0)
         implicitWidth: control.horizontal ? 200 : 48
         implicitHeight: control.horizontal ? 48 : 200
-        width: control.horizontal ? control.availableWidth : 1
-        height: control.horizontal ? 1 : control.availableHeight
-        color: control.Material.foreground
-        scale:control.horizontal && control.mirrored ? -1 : 1
+        width: control.horizontal ? control.availableWidth : 4
+        height: control.horizontal ? 4 : control.availableHeight
+        scale: control.horizontal && control.mirrored ? -1 : 1
+        color: control.enabled ? Color.transparent(control.Material.accentColor, 0.33) : control.Material.sliderDisabledColor
 
         Rectangle {
-            x: control.horizontal ? control.first.position * parent.width : -1
-            y: control.horizontal ? -1 : control.second.visualPosition * parent.height + 3
-            width: control.horizontal ? control.second.position * parent.width - control.first.position * parent.width - 3 : 3
-            height: control.horizontal ? 3 : control.second.position * parent.height - control.first.position * parent.height - 3
+            x: control.horizontal ? control.first.position * parent.width : 0
+            y: control.horizontal ? 0 : control.second.visualPosition * parent.height
+            width: control.horizontal ? control.second.position * parent.width - control.first.position * parent.width : 4
+            height: control.horizontal ? 4 : control.second.position * parent.height - control.first.position * parent.height
 
-            color: control.Material.accentColor
+            color: control.enabled ? control.Material.accentColor : control.Material.sliderDisabledColor
         }
     }
 }
diff --git a/src/imports/controls/material/Slider.qml b/src/imports/controls/material/Slider.qml
index cc6a1413..ac7a0c42 100644
--- a/src/imports/controls/material/Slider.qml
+++ b/src/imports/controls/material/Slider.qml
@@ -36,6 +36,7 @@
 
 import QtQuick 2.12
 import QtQuick.Templates 2.12 as T
+import QtQuick.Controls.impl 2.12
 import QtQuick.Controls.Material 2.12
 import QtQuick.Controls.Material.impl 2.12
 
@@ -63,18 +64,18 @@ T.Slider {
         y: control.topPadding + (control.horizontal ? (control.availableHeight - height) / 2 : 0)
         implicitWidth: control.horizontal ? 200 : 48
         implicitHeight: control.horizontal ? 48 : 200
-        width: control.horizontal ? control.availableWidth : 1
-        height: control.horizontal ? 1 : control.availableHeight
-        color: control.Material.foreground
+        width: control.horizontal ? control.availableWidth : 4
+        height: control.horizontal ? 4 : control.availableHeight
         scale: control.horizontal && control.mirrored ? -1 : 1
+        color: control.enabled ? Color.transparent(control.Material.accentColor, 0.33) : control.Material.sliderDisabledColor
 
         Rectangle {
             x: control.horizontal ? 0 : (parent.width - width) / 2
             y: control.horizontal ? (parent.height - height) / 2 : control.visualPosition * parent.height
-            width: control.horizontal ? control.position * parent.width : 3
-            height: control.horizontal ? 3 : control.position * parent.height
+            width: control.horizontal ? control.position * parent.width : 4
+            height: control.horizontal ? 4 : control.position * parent.height
 
-            color: control.Material.accentColor
+            color: control.enabled ? control.Material.accentColor : control.Material.sliderDisabledColor
         }
     }
 }
diff --git a/src/imports/controls/material/SliderHandle.qml b/src/imports/controls/material/SliderHandle.qml
index 2e3120e4..c9078bc8 100644
--- a/src/imports/controls/material/SliderHandle.qml
+++ b/src/imports/controls/material/SliderHandle.qml
@@ -55,8 +55,8 @@ Item {
         width: parent.width
         height: parent.height
         radius: width / 2
-        color: root.control.Material.accentColor
         scale: root.handlePressed ? 1.5 : 1
+        color: control.enabled ? root.control.Material.accentColor : root.control.Material.sliderDisabledColor
 
         Behavior on scale {
             NumberAnimation {
@@ -71,6 +71,6 @@ Item {
         width: 22; height: 22
         pressed: root.handlePressed
         active: root.handlePressed || root.handleHasFocus || root.handleHovered
-        color: root.control.Material.rippleColor
+        color: root.control.Material.highlightedRippleColor
     }
 }
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index 77a65927..35afeb00 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -422,6 +422,8 @@ static const QRgb rippleColorLight = 0x10000000;
 static const QRgb rippleColorDark = 0x20FFFFFF;
 static const QRgb spinBoxDisabledIconColorLight = 0xFFCCCCCC;
 static const QRgb spinBoxDisabledIconColorDark = 0xFF666666;
+static const QRgb sliderDisabledColorLight = 0xFF9E9E9E;
+static const QRgb sliderDisabledColorDark = 0xFF616161;
 
 static QQuickMaterialStyle::Theme effectiveTheme(QQuickMaterialStyle::Theme theme)
 {
@@ -1037,6 +1039,11 @@ QColor QQuickMaterialStyle::spinBoxDisabledIconColor() const
     return QColor::fromRgba(m_theme == Light ? spinBoxDisabledIconColorLight : spinBoxDisabledIconColorDark);
 }
 
+QColor QQuickMaterialStyle::sliderDisabledColor() const
+{
+    return QColor::fromRgba(m_theme == Light ? sliderDisabledColorLight : sliderDisabledColorDark);
+}
+
 QColor QQuickMaterialStyle::color(QQuickMaterialStyle::Color color, QQuickMaterialStyle::Shade shade) const
 {
     int count = sizeof(colors) / sizeof(colors[0]);
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h
index 4b0f7b31..d2a89761 100644
--- a/src/imports/controls/material/qquickmaterialstyle_p.h
+++ b/src/imports/controls/material/qquickmaterialstyle_p.h
@@ -97,6 +97,7 @@ class QQuickMaterialStyle : public QQuickAttachedObject
     Q_PROPERTY(QColor toolBarColor READ toolBarColor NOTIFY paletteChanged FINAL)
     Q_PROPERTY(QColor toolTextColor READ toolTextColor NOTIFY paletteChanged FINAL)
     Q_PROPERTY(QColor spinBoxDisabledIconColor READ spinBoxDisabledIconColor NOTIFY paletteChanged FINAL)
+    Q_PROPERTY(QColor sliderDisabledColor READ sliderDisabledColor NOTIFY paletteChanged FINAL)
 
     Q_PROPERTY(int touchTarget READ touchTarget CONSTANT FINAL)
     Q_PROPERTY(int buttonHeight READ buttonHeight CONSTANT FINAL)
@@ -237,6 +238,7 @@ public:
     QColor toolBarColor() const;
     QColor toolTextColor() const;
     QColor spinBoxDisabledIconColor() const;
+    QColor sliderDisabledColor() const;
 
     Q_INVOKABLE QColor color(Color color, Shade shade = Shade500) const;
     Q_INVOKABLE QColor shade(const QColor &color, Shade shade) const;
diff --git a/src/quicktemplates2/qquicksplitview.cpp b/src/quicktemplates2/qquicksplitview.cpp
index 219a6b08..a3566c56 100644
--- a/src/quicktemplates2/qquicksplitview.cpp
+++ b/src/quicktemplates2/qquicksplitview.cpp
@@ -327,7 +327,7 @@ void QQuickSplitViewPrivate::layoutResizeSplitItems(qreal &usedWidth, qreal &use
         const bool isAHandlePressed = m_pressedHandleIndex != -1;
         // True if this particular item is being resized as a result of a handle being dragged.
         const bool isBeingResized = isAHandlePressed && ((resizeLeftItem && index == m_pressedHandleIndex)
-            || (!resizeLeftItem && index == m_pressedHandleIndex + 1));
+            || (!resizeLeftItem && index == m_nextVisibleIndexAfterPressedHandle));
         if (isBeingResized) {
             indexBeingResizedDueToDrag = index;
             qCDebug(qlcQQuickSplitView).nospace() << "  - " << index << ": dragging handle for item";
@@ -343,7 +343,7 @@ void QQuickSplitViewPrivate::layoutResizeSplitItems(qreal &usedWidth, qreal &use
 
             // We also need to ensure that the item's edge doesn't go too far
             // out and hence give the item more space than is available.
-            const int firstIndex = resizeLeftItem ? m_pressedHandleIndex + 1 : 0;
+            const int firstIndex = resizeLeftItem ? m_nextVisibleIndexAfterPressedHandle : 0;
             const int lastIndex = resizeLeftItem ? contentModel->count() - 1 : m_pressedHandleIndex;
             const qreal accumulated = accumulatedSize(firstIndex, lastIndex);
 
@@ -421,8 +421,8 @@ void QQuickSplitViewPrivate::layoutResizeSplitItems(qreal &usedWidth, qreal &use
                 // The handle shouldn't cross other handles, so use the left edge of
                 // the first handle to the right as the right edge.
                 qreal rightEdge = size;
-                if (m_pressedHandleIndex + 1 < m_handleItems.size()) {
-                    const QQuickItem *rightHandle = m_handleItems.at(m_pressedHandleIndex + 1);
+                if (m_nextVisibleIndexAfterPressedHandle < m_handleItems.size()) {
+                    const QQuickItem *rightHandle = m_handleItems.at(m_nextVisibleIndexAfterPressedHandle);
                     rightEdge = horizontal ? rightHandle->x() : rightHandle->y();
                 }
 
@@ -740,23 +740,26 @@ void QQuickSplitViewPrivate::createHandleItem(int index)
         creationContext = qmlContext(q);
     QQmlContext *context = new QQmlContext(creationContext, q);
     context->setContextObject(q);
-    QQuickItem *item = qobject_cast<QQuickItem*>(m_handle->beginCreate(context));
-    if (item) {
+    QQuickItem *handleItem = qobject_cast<QQuickItem*>(m_handle->beginCreate(context));
+    if (handleItem) {
+        qCDebug(qlcQQuickSplitView) << "- successfully created handle item" << handleItem << "for split item at index" << index;
+
         // Insert the item to our list of items *before* its parent is set to us,
         // so that we can avoid it being added as a content item by checking
         // if it is in the list in isContent().
-        m_handleItems.insert(index, item);
+        m_handleItems.insert(index, handleItem);
 
-        item->setParentItem(q);
+        handleItem->setParentItem(q);
 
         m_handle->completeCreate();
-        resizeHandle(item);
+        resizeHandle(handleItem);
     }
 }
 
 void QQuickSplitViewPrivate::removeExcessHandles()
 {
     int excess = m_handleItems.size() - qMax(0, contentModel->count() - 1);
+    qCDebug(qlcQQuickSplitView) << "removing" << excess << "excess handles from the end of our list";
     for (; excess > 0; --excess) {
         QQuickItem *handleItem = m_handleItems.takeLast();
         delete handleItem;
@@ -861,6 +864,7 @@ int QQuickSplitViewPrivate::handleIndexForSplitIndex(int splitIndex) const
 
 void QQuickSplitViewPrivate::destroyHandles()
 {
+    qCDebug(qlcQQuickSplitView) << "destroying" << m_handleItems.size() << "handles";
     qDeleteAll(m_handleItems);
     m_handleItems.clear();
 }
@@ -907,7 +911,7 @@ void QQuickSplitViewPrivate::updateHandleVisibilities()
             handleItem->setVisible(item->isVisible());
         else
             handleItem->setVisible(false);
-        qCDebug(qlcQQuickSplitView) << "set visible property of handle at index"
+        qCDebug(qlcQQuickSplitView) << "set visible property of handle" << handleItem << "at index"
             << i << "to" << handleItem->isVisible();
     }
 }
@@ -915,6 +919,8 @@ void QQuickSplitViewPrivate::updateHandleVisibilities()
 void QQuickSplitViewPrivate::updateHoveredHandle(QQuickItem *hoveredItem)
 {
     Q_Q(QQuickSplitView);
+    qCDebug(qlcQQuickSplitViewMouse) << "updating hovered handle after" << hoveredItem << "was hovered";
+
     const int oldHoveredHandleIndex = m_hoveredHandleIndex;
     m_hoveredHandleIndex = m_handleItems.indexOf(hoveredItem);
     if (m_hoveredHandleIndex == oldHoveredHandleIndex)
@@ -983,7 +989,21 @@ void QQuickSplitViewPrivate::handlePress(const QPointF &point)
         m_mousePos = point;
 
         const QQuickItem *leftOrTopItem = qobject_cast<QQuickItem*>(contentModel->object(m_pressedHandleIndex));
-        const QQuickItem *rightOrBottomItem = qobject_cast<QQuickItem*>(contentModel->object(m_pressedHandleIndex + 1));
+        // Find the first item to the right/bottom of this one that is visible.
+        QQuickItem *rightOrBottomItem = nullptr;
+        m_nextVisibleIndexAfterPressedHandle = -1;
+        for (int i = m_pressedHandleIndex + 1; i < contentModel->count(); ++i) {
+            auto nextItem = qobject_cast<QQuickItem*>(contentModel->object(i));
+            if (nextItem->isVisible()) {
+                rightOrBottomItem = nextItem;
+                m_nextVisibleIndexAfterPressedHandle = i;
+                break;
+            }
+        }
+        Q_ASSERT_X(rightOrBottomItem, Q_FUNC_INFO, qPrintable(QString::fromLatin1(
+            "Failed to find a visible item to the right/bottom of the one that was pressed at index %1; this shouldn't happen")
+                .arg(m_pressedHandleIndex)));
+
         const bool isHorizontal = m_orientation == Qt::Horizontal;
         m_leftOrTopItemSizeBeforePress = isHorizontal ? leftOrTopItem->width() : leftOrTopItem->height();
         m_rightOrBottomItemSizeBeforePress = isHorizontal ? rightOrBottomItem->width() : rightOrBottomItem->height();
@@ -1002,8 +1022,10 @@ void QQuickSplitViewPrivate::handlePress(const QPointF &point)
         qCDebug(qlcQQuickSplitViewMouse).nospace() << "handled press -"
             << " left/top index=" << m_pressedHandleIndex << ","
             << " size before press=" << m_leftOrTopItemSizeBeforePress << ","
-            << " right/bottom index=" << m_pressedHandleIndex + 1 << ","
-            << " size before press=" << m_rightOrBottomItemSizeBeforePress;
+            << " item=" << leftOrTopItem
+            << " right/bottom index=" << m_nextVisibleIndexAfterPressedHandle << ","
+            << " size before press=" << m_rightOrBottomItemSizeBeforePress
+            << " item=" << rightOrBottomItem;
     }
 }
 
@@ -1205,8 +1227,10 @@ void QQuickSplitView::setHandle(QQmlComponent *handle)
 
     d->m_handle = handle;
 
-    if (d->m_handle)
+    if (d->m_handle) {
         d->createHandles();
+        d->updateHandleVisibilities();
+    }
 
     d->requestLayout();
 
diff --git a/src/quicktemplates2/qquicksplitview_p_p.h b/src/quicktemplates2/qquicksplitview_p_p.h
index ccefe5ec..2430eac1 100644
--- a/src/quicktemplates2/qquicksplitview_p_p.h
+++ b/src/quicktemplates2/qquicksplitview_p_p.h
@@ -112,6 +112,7 @@ public:
     QVector<QQuickItem*> m_handleItems;
     int m_hoveredHandleIndex = -1;
     int m_pressedHandleIndex = -1;
+    int m_nextVisibleIndexAfterPressedHandle = -1;
     QPointF m_pressPos;
     QPointF m_mousePos;
     QPointF m_handlePosBeforePress;